Merge branch 'tier-split-wood-recipe' into 2.9

Author: tier940

gradle.properties

@@ -33,20 +33,6 @@ public class GTERecipeMaps {
                     .sound(SoundEvents.BLOCK_SAND_PLACE)
                     .build();
 
-    @ZenProperty
-    public static final RecipeMap<SimpleRecipeBuilder> SAWMILL_RECIPES = new RecipeMapBuilder<>(
-            "sawmill", new SimpleRecipeBuilder())
-                    .itemInputs(2)
-                    .itemOutputs(2)
-                    .fluidInputs(1)
-                    .fluidOutputs(0)
-                    .itemSlotOverlay(GuiTextures.SAWBLADE_OVERLAY, false)
-                    .itemSlotOverlay(GuiTextures.CUTTER_OVERLAY, true)
-                    .itemSlotOverlay(GuiTextures.DUST_OVERLAY, true, true)
-                    .progressBar(GuiTextures.PROGRESS_BAR_SLICE, ProgressWidget.MoveType.HORIZONTAL)
-                    .sound(GTSoundEvents.CHAINSAW_TOOL)
-                    .build();
-
     @ZenProperty
     public static final RecipeMap<SimpleRecipeBuilder> VOID_ORE_MINER_RECIPES = new RecipeMapBuilder<>(
             "void_ore_miner", new SimpleRecipeBuilder())

spotless.eclipseformat.xml

@@ -11,8 +11,6 @@
 public class GTETextures {
 
     // Core
-    public static SimpleOverlayRenderer SAWMILL_CASING;
-    public static OrientedOverlayRenderer SAWMILL_OVERLAY = new OrientedOverlayRenderer("machines/sawmill");
     public static SimpleOverlayRenderer VOID_ORE_MINER_CASING;
 
     // Ender IO
@@ -34,7 +32,6 @@ public class GTETextures {
 
     public static void preInit() {
         // Core
-        SAWMILL_CASING = new SimpleOverlayRenderer("casings/sawmill_casing");
         VOID_ORE_MINER_CASING = new SimpleOverlayRenderer("casings/void_ore_miner_casing");
 
         // Draconic Evolution

src/main/java/gtexpert/api/recipes/GTERecipeMaps.java

@@ -21,7 +21,7 @@ public GTEBlockMetalCasing() {
         setResistance(10.0f);
         setSoundType(SoundType.METAL);
         setHarvestLevel(ToolClasses.WRENCH, 2);
-        setDefaultState(getState(MetalCasingType.SAWMill));
+        setDefaultState(getState(MetalCasingType.DRACONIUM_CASING));
     }
 
     @Override
@@ -32,7 +32,6 @@ public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAcces
 
     public enum MetalCasingType implements IStringSerializable {
 
-        SAWMill("sawmill_casing"),
         VOID_ORE_MINER("void_ore_miner_casing"),
         DRACONIUM_CASING("draconium_casing"),
         AWAKENED_DRACONIUM_CASING("awakened_draconium_casing");

src/main/java/gtexpert/client/GTETextures.java

@@ -14,21 +14,17 @@ public class GTEMetaBlocks {
 
     public static GTEBlockWireCoil GTE_WIRE_COIL;
     public static GTEBlockMetalCasing GTE_METAL_CASING;
-    public static BlockSawmillConveyor BLOCK_SAWMILL_CONVEYOR;
 
     public static void init() {
         GTE_METAL_CASING = new GTEBlockMetalCasing();
         GTE_METAL_CASING.setRegistryName("gte_metal_casing");
-        BLOCK_SAWMILL_CONVEYOR = new BlockSawmillConveyor();
-        BLOCK_SAWMILL_CONVEYOR.setRegistryName("sawmill_conveyor");
         GTE_WIRE_COIL = new GTEBlockWireCoil();
         GTE_WIRE_COIL.setRegistryName("gte_wire_coil");
     }
 
     @SideOnly(Side.CLIENT)
     public static void registerItemModels() {
         registerItemModel(GTE_METAL_CASING);
-        registerItemModel(BLOCK_SAWMILL_CONVEYOR);
         GTE_WIRE_COIL.onModelRegister();
     }
 

src/main/java/gtexpert/common/blocks/BlockSawmillConveyor.java

@@ -20,7 +20,6 @@ public class GTEMetaTileEntities {
     public static SteamCircuitAssembler STEAM_CIRCUIT_ASSEMBLER_STEEL;
 
     // Multi Machine
-    public static MetaTileEntitySawmill SAWMILL;
     public static MetaTileEntityLargeCrackingUnit LARGE_CRACKER;
     public static MetaTileEntityVoidOreMiner VOIDOREMINER;
     public static MetaTileEntityAdvancedChemicalPlant ADVANCED_CHEMICAL_PLANT;
@@ -46,12 +45,8 @@ public static void init() {
                     new SteamCircuitAssembler(gteId("steam_circuit_assembler_steel"), true));
         }
 
-        // Sawmill
-        SAWMILL = registerMetaTileEntity(mteMultiStartId,
-                new MetaTileEntitySawmill(gteId("sawmill")));
-
-        // Large Cracking Unit
-        LARGE_CRACKER = registerMetaTileEntity(mteMultiStartId += 1,
+        // Multi Machine
+        LARGE_CRACKER = registerMetaTileEntity(12002,
                 new MetaTileEntityLargeCrackingUnit(gteId("large_cracking_unit")));
 
         // Void Ore Miner

src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java

@@ -6,7 +6,6 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.SidedProxy;
@@ -33,12 +32,10 @@
 import gtexpert.common.items.GTEMetaItems;
 import gtexpert.common.items.GTEToolItems;
 import gtexpert.common.metatileentities.GTEMetaTileEntities;
-import gtexpert.loaders.GTEMaterialInfoLoader;
 import gtexpert.loaders.GTEOreDictionaryLoader;
 import gtexpert.loaders.recipe.CEUOverrideRecipe;
 import gtexpert.loaders.recipe.GTERecipe;
 import gtexpert.loaders.recipe.GTEVanillaOverrideRecipes;
-import gtexpert.loaders.recipe.GTEWoodRecipe;
 import gtexpert.loaders.recipe.handlers.GTEToolRecipeHandler;
 import gtexpert.modules.GTEModules;
 
@@ -96,7 +93,6 @@ public void registerBlocks(RegistryEvent.Register<Block> event) {
 
         registry.register(GTE_WIRE_COIL);
         registry.register(GTE_METAL_CASING);
-        registry.register(BLOCK_SAWMILL_CONVEYOR);
     }
 
     @Override
@@ -105,21 +101,18 @@ public void registerItems(RegistryEvent.Register<Item> event) {
 
         registry.register(createItemBlock(GTE_WIRE_COIL, VariantItemBlock::new));
         registry.register(createItemBlock(GTE_METAL_CASING, VariantItemBlock::new));
-        registry.register(createItemBlock(BLOCK_SAWMILL_CONVEYOR, ItemBlock::new));
     }
 
     @Override
     public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         GTEToolRecipeHandler.register();
-        GTEMaterialInfoLoader.init();
         GTEOreDictionaryLoader.init();
         GTEMetaTileEntities.init();
     }
 
     @Override
     public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
         GTERecipe.init();
-        GTEWoodRecipe.init();
         CEUOverrideRecipe.init();
         GTEVanillaOverrideRecipes.init();
     }