fixed stone texures with beyond earth, fixed machine recipe

GregTech-Intergalactical · Sep 13, 2023 · 85cf34c · 85cf34c
1 parent 1ba7da3
commit 85cf34c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/src/main/java/muramasa/gregtech/integration/SpaceModRegistrar.java b/common/src/main/java/muramasa/gregtech/integration/SpaceModRegistrar.java
@@ -34,15 +34,14 @@ public String getId() {
     @Override
     public void onRegistrationEvent(RegistrationEvent event, Side side) {
         if (event == RegistrationEvent.DATA_INIT){
-            AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "moon_sand", Material.NULL, new Texture(getMod(), "block/moon_sand"), SoundType.SAND, false).setState(getSpaceBlock("moon_sand")).setSandLike(true));
-            var moonStone = AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "moon_stone", Material.NULL, new Texture(getMod(), "block/moon_stone"), SoundType.STONE, false).setState(getSpaceBlock("moon_stone")));
-            AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "mars_sand", Material.NULL, new Texture(getMod(), "block/mars_sand"), SoundType.SAND, false).setState(getSpaceBlock("mars_sand")).setSandLike(true));
-            var marsStone = AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "mars_stone", Material.NULL, new Texture(getMod(), "block/mars_stone"), SoundType.STONE, false).setState(getSpaceBlock("mars_stone")));
-            if (AntimatterAPI.isModLoaded("ad_astra")){
-                ORE.replacement(Iron, moonStone, () -> getSpaceBlock("moon_iron_ore").asItem());
-                ORE.replacement(Iron, marsStone, () -> getSpaceBlock("mars_iron_ore").asItem());
-                ORE.replacement(Diamond, marsStone, () -> getSpaceBlock("mars_diamond_ore").asItem());
-            }
+            String block = AntimatterAPI.isModLoaded("ad_astra") ? "block" : "blocks";
+            AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "moon_sand", Material.NULL, new Texture(getMod(), block + "/moon_sand"), SoundType.SAND, false).setState(getSpaceBlock("moon_sand")).setSandLike(true));
+            var moonStone = AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "moon_stone", Material.NULL, new Texture(getMod(), block + "/moon_stone"), SoundType.STONE, false).setState(getSpaceBlock("moon_stone")));
+            AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "mars_sand", Material.NULL, new Texture(getMod(), block + "/mars_sand"), SoundType.SAND, false).setState(getSpaceBlock("mars_sand")).setSandLike(true));
+            var marsStone = AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "mars_stone", Material.NULL, new Texture(getMod(), block + "/mars_stone"), SoundType.STONE, false).setState(getSpaceBlock("mars_stone")));
+            ORE.replacement(Iron, moonStone, () -> getSpaceBlock("moon_iron_ore").asItem());
+            ORE.replacement(Iron, marsStone, () -> getSpaceBlock("mars_iron_ore").asItem());
+            ORE.replacement(Diamond, marsStone, () -> getSpaceBlock("mars_diamond_ore").asItem());
         }
     }
 

diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java b/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java
@@ -458,7 +458,7 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
                             .put('D', DataOrb)
                             .put('M', hull)
                             .put('C', conveyor).build(), "DMC"));
-            add(SUPER_BUFFER, tier, (m, item) -> provider.addItemRecipe(output, "machines", "has_motor", provider.hasSafeItem(motor), item,
+            add(SUPER_BUFFER, tier, (m, item) -> provider.addItemRecipe(output, GTIRef.ID, "super_buffer_" + tier.getId() +"_1", "machines", "has_motor", provider.hasSafeItem(motor), item,
                     ImmutableMap.<Character, Object>builder()
                             .put('D', CircuitDataStorage)
                             .put('M', hull)
+5 −0		common/src/main/java/muramasa/antimatter/datagen/AntimatterDynamics.java
+24 −4		common/src/main/java/muramasa/antimatter/worldgen/AntimatterWorldGenerator.java
+1 −1		common/src/main/java/muramasa/antimatter/worldgen/vein/WorldGenVeinLayerBuilder.java