Skip to content

Commit 2b43bb7

Browse files
committed
Migrate to GTWoodProcessing
1 parent 31a6598 commit 2b43bb7

35 files changed

Lines changed: 1 addition & 506 deletions

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ public class GTERecipeMaps {
2929
.setProgressBar(GuiTextures.PROGRESS_BAR_SIFT, ProgressWidget.MoveType.VERTICAL_INVERTED)
3030
.setSound(SoundEvents.BLOCK_SAND_PLACE);
3131

32-
@ZenProperty
33-
public static final RecipeMap<SimpleRecipeBuilder> SAWMILL_RECIPES = new RecipeMap<>(
34-
"sawmill", 2, 2, 1, 0, new SimpleRecipeBuilder(), false)
35-
.setSlotOverlay(false, false, GuiTextures.SAWBLADE_OVERLAY)
36-
.setSlotOverlay(true, false, false, GuiTextures.CUTTER_OVERLAY)
37-
.setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY)
38-
.setProgressBar(GuiTextures.PROGRESS_BAR_SLICE, ProgressWidget.MoveType.HORIZONTAL)
39-
.setSound(GTSoundEvents.CHAINSAW_TOOL);
40-
4132
@ZenProperty
4233
public static final RecipeMap<SimpleRecipeBuilder> VOID_ORE_MINER_RECIPES = new RecipeMap<>(
4334
"void_ore_miner", 1, 1, 2, 0, new SimpleRecipeBuilder(), false)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
public class GTETextures {
1212

1313
// Core
14-
public static SimpleOverlayRenderer SAWMILL_CASING;
15-
public static OrientedOverlayRenderer SAWMILL_OVERLAY = new OrientedOverlayRenderer("machines/sawmill");
1614
public static SimpleOverlayRenderer VOID_ORE_MINER_CASING;
1715

1816
// Ender IO
@@ -34,7 +32,6 @@ public class GTETextures {
3432

3533
public static void preInit() {
3634
// Core
37-
SAWMILL_CASING = new SimpleOverlayRenderer("casings/sawmill_casing");
3835
VOID_ORE_MINER_CASING = new SimpleOverlayRenderer("casings/void_ore_miner_casing");
3936

4037
// Draconic Evolution

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

Lines changed: 0 additions & 92 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public GTEBlockMetalCasing() {
2121
setResistance(10.0f);
2222
setSoundType(SoundType.METAL);
2323
setHarvestLevel(ToolClasses.WRENCH, 2);
24-
setDefaultState(getState(MetalCasingType.SAWMill));
24+
setDefaultState(getState(MetalCasingType.DRACONIUM_CASING));
2525
}
2626

2727
@Override
@@ -32,7 +32,6 @@ public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAcces
3232

3333
public enum MetalCasingType implements IStringSerializable {
3434

35-
SAWMill("sawmill_casing"),
3635
VOID_ORE_MINER("void_ore_miner_casing"),
3736
DRACONIUM_CASING("draconium_casing"),
3837
AWAKENED_DRACONIUM_CASING("awakened_draconium_casing");

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,17 @@ public class GTEMetaBlocks {
1414

1515
public static GTEBlockWireCoil GTE_WIRE_COIL;
1616
public static GTEBlockMetalCasing GTE_METAL_CASING;
17-
public static BlockSawmillConveyor BLOCK_SAWMILL_CONVEYOR;
1817

1918
public static void init() {
2019
GTE_METAL_CASING = new GTEBlockMetalCasing();
2120
GTE_METAL_CASING.setRegistryName("gte_metal_casing");
22-
BLOCK_SAWMILL_CONVEYOR = new BlockSawmillConveyor();
23-
BLOCK_SAWMILL_CONVEYOR.setRegistryName("sawmill_conveyor");
2421
GTE_WIRE_COIL = new GTEBlockWireCoil();
2522
GTE_WIRE_COIL.setRegistryName("gte_wire_coil");
2623
}
2724

2825
@SideOnly(Side.CLIENT)
2926
public static void registerItemModels() {
3027
registerItemModel(GTE_METAL_CASING);
31-
registerItemModel(BLOCK_SAWMILL_CONVEYOR);
3228
GTE_WIRE_COIL.onModelRegister();
3329
}
3430

src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public class GTEMetaTileEntities {
2828
public static SteamCircuitAssembler STEAM_CIRCUIT_ASSEMBLER_STEEL;
2929

3030
// Multi Machine
31-
public static MetaTileEntitySawmill SAWMILL;
3231
public static MetaTileEntityLargeCrackingUnit LARGE_CRACKER;
3332
public static MetaTileEntityVoidOreMiner VOIDOREMINER;
3433
public static MetaTileEntityAdvancedChemicalPlant ADVANCED_CHEMICAL_PLANT;
@@ -53,8 +52,6 @@ public static void init() {
5352
}
5453

5554
// Multi Machine
56-
SAWMILL = registerMetaTileEntity(12001,
57-
new MetaTileEntitySawmill(gteId("sawmill")));
5855
LARGE_CRACKER = registerMetaTileEntity(12002,
5956
new MetaTileEntityLargeCrackingUnit(gteId("large_cracking_unit")));
6057
VOIDOREMINER = registerMetaTileEntity(12003,

src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntitySawmill.java

Lines changed: 0 additions & 126 deletions
This file was deleted.

src/main/java/gtexpert/core/GTECoreModule.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import net.minecraft.block.Block;
88
import net.minecraft.item.Item;
9-
import net.minecraft.item.ItemBlock;
109
import net.minecraft.item.crafting.IRecipe;
1110
import net.minecraftforge.event.RegistryEvent;
1211
import net.minecraftforge.fml.common.SidedProxy;
@@ -33,7 +32,6 @@
3332
import gtexpert.common.items.GTEMetaItems;
3433
import gtexpert.common.items.GTEToolItems;
3534
import gtexpert.common.metatileentities.GTEMetaTileEntities;
36-
import gtexpert.loaders.GTEMaterialInfoLoader;
3735
import gtexpert.loaders.GTEOreDictionaryLoader;
3836
import gtexpert.loaders.recipe.CEUOverrideRecipe;
3937
import gtexpert.loaders.recipe.GTERecipe;
@@ -93,7 +91,6 @@ public void registerBlocks(RegistryEvent.Register<Block> event) {
9391

9492
registry.register(GTE_WIRE_COIL);
9593
registry.register(GTE_METAL_CASING);
96-
registry.register(BLOCK_SAWMILL_CONVEYOR);
9794
}
9895

9996
@Override
@@ -105,13 +102,11 @@ public void registerItems(RegistryEvent.Register<Item> event) {
105102

106103
registry.register(createItemBlock(GTE_WIRE_COIL, VariantItemBlock::new));
107104
registry.register(createItemBlock(GTE_METAL_CASING, VariantItemBlock::new));
108-
registry.register(createItemBlock(BLOCK_SAWMILL_CONVEYOR, ItemBlock::new));
109105
}
110106

111107
@Override
112108
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
113109
GTEToolRecipeHandler.register();
114-
GTEMaterialInfoLoader.init();
115110
GTEOreDictionaryLoader.init();
116111
GTEMetaTileEntities.init();
117112
}

src/main/java/gtexpert/loaders/GTEMaterialInfoLoader.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)