diff --git a/dependencies.gradle b/dependencies.gradle index d6d55e09..fa2dabfb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -58,10 +58,16 @@ dependencies { devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5411078")) // AE2UEL 0.56.6 } + // Debug GTWoodProcessing + compileOnly rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776") // GTWoodProcessing 1.2.2 + if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) { + runtimeOnlyNonPublishable rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776") + } + // Debug ImplosionNoBomb - compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5680426") // ImplosionNoBomb 1.0.0 + compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5731331") // ImplosionNoBomb 1.1.0 if (project.debug_all.toBoolean() || project.debug_inb.toBoolean()) { - runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5680426") + runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5731331") } // Debug AE Additions diff --git a/gradle.properties b/gradle.properties index d66b336c..e0b7c7a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ modGroup = gtexpert # Version of your mod. # This field can be left empty if you want your mod's version to be determined by the latest git tag instead. -modVersion = 2.3.2-beta +modVersion = 2.3.2-beta # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version) includeMCVersionJar = true @@ -27,6 +27,7 @@ useAE2uelExtended = false # Debug mod compatibility debug_all = false +debug_gtwp = false debug_inb = false debug_aea = false debug_nae2 = false diff --git a/src/main/java/gtexpert/GTExpertMod.java b/src/main/java/gtexpert/GTExpertMod.java index d67e95e4..c301ff7c 100644 --- a/src/main/java/gtexpert/GTExpertMod.java +++ b/src/main/java/gtexpert/GTExpertMod.java @@ -35,8 +35,8 @@ version = Tags.VERSION, updateJSON = "https://forge.curseupdate.com/851103/gtexpert", dependencies = GTInternalTags.DEP_VERSION_STRING + "required-after:" + Mods.Names.MIXINBOOTER + ";" + - "required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" + "after:" + Mods.Names.IMPLOSION_NO_BOMB + - ";" + + "required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" + + "after:" + Mods.Names.GREGTECH_WOOD_PROCESSING + ";" + "after:" + Mods.Names.IMPLOSION_NO_BOMB + ";" + "after:" + Mods.Names.GREGTECH_FOOD_OPTION + ";" + "after:" + Mods.Names.APPLIED_ENERGISTICS2 + ";" + "after:" + Mods.Names.AE_ADDITIONS + ";" + "after:" + Mods.Names.AE2_FLUID_CRAFTING + ";" + "after:" + Mods.Names.NEEVES_AE2 + ";" + "after:" + Mods.Names.EXTRA_CPUS + ";" + diff --git a/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java b/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java index 3a680b7f..2f256a52 100644 --- a/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java +++ b/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java @@ -24,15 +24,6 @@ public class GTERecipeMaps { .setProgressBar(GuiTextures.PROGRESS_BAR_SIFT, ProgressWidget.MoveType.VERTICAL_INVERTED) .setSound(SoundEvents.BLOCK_SAND_PLACE); - @ZenProperty - public static final RecipeMap SAWMILL_RECIPES = new RecipeMap<>( - "sawmill", 2, 2, 1, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.SAWBLADE_OVERLAY) - .setSlotOverlay(true, false, false, GuiTextures.CUTTER_OVERLAY) - .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_SLICE, ProgressWidget.MoveType.HORIZONTAL) - .setSound(GTSoundEvents.CHAINSAW_TOOL); - @ZenProperty public static final RecipeMap VOID_ORE_MINER_RECIPES = new RecipeMap<>( "void_ore_miner", 1, 1, 2, 0, new SimpleRecipeBuilder(), false) diff --git a/src/main/java/gtexpert/api/util/Mods.java b/src/main/java/gtexpert/api/util/Mods.java index 4b85982f..554046d4 100644 --- a/src/main/java/gtexpert/api/util/Mods.java +++ b/src/main/java/gtexpert/api/util/Mods.java @@ -75,6 +75,7 @@ public enum Mods { GregTech(Names.GREGTECH), GregTechFoodOption(Names.GREGTECH_FOOD_OPTION), GregTechExpertCore(GTEValues.MODID), + GregTechWoodProcessing(Names.GREGTECH_WOOD_PROCESSING), GroovyScript(Names.GROOVY_SCRIPT), HWYLA(Names.HWYLA), ImplosionNoBomb(Names.IMPLOSION_NO_BOMB), @@ -170,6 +171,7 @@ public static class Names { public static final String GREGICALITY_MULTIBLOCKS = "gcym"; public static final String GREGTECH = GTValues.MODID; public static final String GREGTECH_FOOD_OPTION = "gregtechfoodoption"; + public static final String GREGTECH_WOOD_PROCESSING = "gtwp"; public static final String GROOVY_SCRIPT = "groovyscript"; public static final String HWYLA = "hwyla"; public static final String IMPLOSION_NO_BOMB = "inb"; diff --git a/src/main/java/gtexpert/client/GTETextures.java b/src/main/java/gtexpert/client/GTETextures.java index 49fe04d8..5478421c 100644 --- a/src/main/java/gtexpert/client/GTETextures.java +++ b/src/main/java/gtexpert/client/GTETextures.java @@ -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 diff --git a/src/main/java/gtexpert/common/GTEConfigHolder.java b/src/main/java/gtexpert/common/GTEConfigHolder.java index ed03d1fb..f1332fc8 100644 --- a/src/main/java/gtexpert/common/GTEConfigHolder.java +++ b/src/main/java/gtexpert/common/GTEConfigHolder.java @@ -57,14 +57,6 @@ public static class ModpackFlag { public static class GregtechOverride { - @Config.Comment({ "Making Planks even more difficult.", - "CEu's hardWoodRecipes & nerfWoodCrafting to true to reflect.", "Default: false" }) - public boolean moreNerfPlankCrafting = false; - - @Config.Comment({ "Making Sticks even more difficult.", - "CEu's harderRods to true to reflect.", "Default: false" }) - public boolean moreNerfStickCrafting = false; - @Config.Comment({ "Change to a recipe using Assembly Line.", "CEu's enableHighTierSolars to true to reflect.", "Default: false" }) public boolean hardSolarPanel = false; diff --git a/src/main/java/gtexpert/common/blocks/BlockSawmillConveyor.java b/src/main/java/gtexpert/common/blocks/BlockSawmillConveyor.java deleted file mode 100644 index 547fcc33..00000000 --- a/src/main/java/gtexpert/common/blocks/BlockSawmillConveyor.java +++ /dev/null @@ -1,92 +0,0 @@ -package gtexpert.common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.SoundType; -import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import org.jetbrains.annotations.NotNull; - -import gregtech.api.items.toolitem.ToolClasses; - -public class BlockSawmillConveyor extends Block { - - public static final PropertyDirection FACING = BlockHorizontal.FACING; - - public BlockSawmillConveyor() { - super(net.minecraft.block.material.Material.IRON); - setTranslationKey("sawmill_conveyor"); - setHardness(2.5f); - setResistance(10.0f); - setSoundType(SoundType.WOOD); - setHarvestLevel(ToolClasses.WRENCH, 1); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); - } - - @Override - public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos, - @NotNull EntityLiving.SpawnPlacementType type) { - return false; - } - - @Override - protected @NotNull BlockStateContainer createBlockState() { - return new BlockStateContainer(this, FACING); - } - - @Override - public int getMetaFromState(@NotNull IBlockState state) { - return state.getValue(BlockHorizontal.FACING).getHorizontalIndex(); - } - - @NotNull - public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(FACING, EnumFacing.byHorizontalIndex(meta)); - } - - @Override - public @NotNull IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, - float hitY, float hitZ, int meta, - @NotNull EntityLivingBase placer) { - return getDefaultState().withProperty(FACING, placer.getHorizontalFacing().getOpposite()); - } - - @Override - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.CUTOUT; - } - - @Override - public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face) { - if (face == EnumFacing.UP) return false; - return super.doesSideBlockRendering(state, world, pos, face); - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean isTopSolid(IBlockState state) { - return true; - } - - @Override - public boolean isSideSolid(IBlockState base_state, IBlockAccess world, BlockPos pos, EnumFacing side) { - if (side == EnumFacing.UP) { - return true; - } else { - return false; - } - } -} diff --git a/src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java b/src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java index 5cbfa70d..798f2427 100644 --- a/src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java +++ b/src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java @@ -21,7 +21,7 @@ public GTEBlockMetalCasing() { setResistance(10.0f); setSoundType(SoundType.METAL); setHarvestLevel(ToolClasses.WRENCH, 2); - setDefaultState(getState(MetalCasingType.SAWMill)); + setDefaultState(getState(MetalCasingType.VOID_ORE_MINER)); } @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"); diff --git a/src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java b/src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java index 33100356..377d7804 100644 --- a/src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java +++ b/src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java @@ -14,13 +14,10 @@ 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"); } @@ -28,7 +25,6 @@ public static void init() { @SideOnly(Side.CLIENT) public static void registerItemModels() { registerItemModel(GTE_METAL_CASING); - registerItemModel(BLOCK_SAWMILL_CONVEYOR); GTE_WIRE_COIL.onModelRegister(); } diff --git a/src/main/java/gtexpert/common/items/GTEToolItems.java b/src/main/java/gtexpert/common/items/GTEToolItems.java deleted file mode 100644 index a9e47da6..00000000 --- a/src/main/java/gtexpert/common/items/GTEToolItems.java +++ /dev/null @@ -1,42 +0,0 @@ -package gtexpert.common.items; - -import gregtech.api.GTValues; -import gregtech.api.items.toolitem.*; -import gregtech.common.items.ToolItems; -import gregtech.common.items.tool.*; -import gregtech.core.sound.GTSoundEvents; - -public final class GTEToolItems { - - private GTEToolItems() {/**/} - - public static IGTTool CHAINSAW_HV; - public static IGTTool CHAINSAW_IV; - - public static void init() { - CHAINSAW_HV = ToolItems.register(ItemGTTool.Builder.of(GTValues.MODID, "chainsaw_hv") - .toolStats(b -> b.blockBreaking() - .efficiencyMultiplier(3.0F) - .attackDamage(5.0F).attackSpeed(-3.2F) - .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_HV) - .behaviors(HarvestIceBehavior.INSTANCE, DisableShieldBehavior.INSTANCE, - TreeFellingBehavior.INSTANCE)) - .oreDict(ToolOreDict.toolAxe) - .secondaryOreDicts(ToolOreDict.toolChainsaw) - .sound(GTSoundEvents.CHAINSAW_TOOL, true) - .toolClasses(ToolClasses.AXE) - .electric(GTValues.HV)); - CHAINSAW_IV = ToolItems.register(ItemGTTool.Builder.of(GTValues.MODID, "chainsaw_iv") - .toolStats(b -> b.blockBreaking() - .efficiencyMultiplier(4.0F) - .attackDamage(5.0F).attackSpeed(-3.2F) - .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_IV) - .behaviors(HarvestIceBehavior.INSTANCE, DisableShieldBehavior.INSTANCE, - TreeFellingBehavior.INSTANCE)) - .oreDict(ToolOreDict.toolAxe) - .secondaryOreDicts(ToolOreDict.toolChainsaw) - .sound(GTSoundEvents.CHAINSAW_TOOL, true) - .toolClasses(ToolClasses.AXE) - .electric(GTValues.IV)); - } -} diff --git a/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java b/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java index 7bbd71de..84b714a9 100644 --- a/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java +++ b/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java @@ -28,7 +28,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; @@ -53,8 +52,7 @@ public static void init() { } // Multi Machine - SAWMILL = registerMetaTileEntity(12001, - new MetaTileEntitySawmill(gteId("sawmill"))); + // LARGE_CRACKER = registerMetaTileEntity(12002, new MetaTileEntityLargeCrackingUnit(gteId("large_cracking_unit"))); VOIDOREMINER = registerMetaTileEntity(12003, diff --git a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntitySawmill.java b/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntitySawmill.java deleted file mode 100644 index f44f77a1..00000000 --- a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntitySawmill.java +++ /dev/null @@ -1,126 +0,0 @@ -package gtexpert.common.metatileentities.multi; - -import java.util.List; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.I18n; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundEvent; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import gregtech.api.gui.resources.TextureArea; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; -import gregtech.api.metatileentity.multiblock.IMultiblockPart; -import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; -import gregtech.api.pattern.BlockPattern; -import gregtech.api.pattern.FactoryBlockPattern; -import gregtech.api.pattern.TraceabilityPredicate; -import gregtech.client.renderer.ICubeRenderer; -import gregtech.core.sound.GTSoundEvents; - -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.recipes.GTERecipeMaps; -import gtexpert.client.GTETextures; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; - -public class MetaTileEntitySawmill extends RecipeMapMultiblockController { - - public MetaTileEntitySawmill(ResourceLocation metaTileEntityId) { - super(metaTileEntityId, GTERecipeMaps.SAWMILL_RECIPES); - } - - @Override - public @NotNull MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntitySawmill(metaTileEntityId); - } - - @Override - protected @NotNull BlockPattern createStructurePattern() { - TraceabilityPredicate casing = states(getCasingState()).setMinGlobalLimited(14); - TraceabilityPredicate abilities = autoAbilities(true, false, true, true, true, false, false); - return FactoryBlockPattern.start() - .aisle("XCX", "X#X", "X X") - .aisle(" C ", " # ", "XXX") - .aisle(" C ", " # ", "X X") - .aisle(" C ", " # ", "XXX") - .aisle("XCX", "S#X", "X X") - .where('S', selfPredicate()) - .where('X', casing.or(abilities)) - .where('C', blocks(GTEMetaBlocks.BLOCK_SAWMILL_CONVEYOR)) - .where('#', air()) - .where(' ', any()) - .build(); - } - - @Override - public boolean allowsExtendedFacing() { - return false; - } - - @Override - public boolean allowsFlip() { - return false; - } - - @Override - public boolean hasMaintenanceMechanics() { - return false; - } - - @Override - public boolean canBeDistinct() { - return true; - } - - @SideOnly(Side.CLIENT) - @Override - public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) { - return GTETextures.SAWMILL_CASING; - } - - protected IBlockState getCasingState() { - return GTEMetaBlocks.GTE_METAL_CASING.getState(GTEBlockMetalCasing.MetalCasingType.SAWMill); - } - - @Override - public SoundEvent getBreakdownSound() { - return GTSoundEvents.BREAKDOWN_ELECTRICAL; - } - - @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, - boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); - tooltip.add(I18n.format("gtexpert.machine.sawmill.tooltip.1")); - } - - @Override - protected @NotNull TextureArea getLogo() { - return GTEGuiTextures.GTE_LOGO_DARK; - } - - @Override - protected @NotNull TextureArea getWarningLogo() { - return GTEGuiTextures.GTE_LOGO_BLINKING_YELLOW; - } - - @Override - protected @NotNull TextureArea getErrorLogo() { - return GTEGuiTextures.GTE_LOGO_BLINKING_RED; - } - - @SideOnly(Side.CLIENT) - @NotNull - @Override - protected ICubeRenderer getFrontOverlay() { - return GTETextures.SAWMILL_OVERLAY; - } -} diff --git a/src/main/java/gtexpert/core/GTECoreModule.java b/src/main/java/gtexpert/core/GTECoreModule.java index f55851f1..3cc9e6d0 100644 --- a/src/main/java/gtexpert/core/GTECoreModule.java +++ b/src/main/java/gtexpert/core/GTECoreModule.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; @@ -31,15 +30,11 @@ import gtexpert.common.blocks.GTEBlockWireCoil; import gtexpert.common.blocks.GTEMetaBlocks; 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; @GTEModule( @@ -71,7 +66,6 @@ public void preInit(FMLPreInitializationEvent event) { GTEMetaBlocks.init(); GTEMetaItems.init(); - GTEToolItems.init(); /* Start API Block Registration */ for (GTEBlockWireCoil.GTECoilType type : GTEBlockWireCoil.GTECoilType.values()) { @@ -94,7 +88,6 @@ public void registerBlocks(RegistryEvent.Register event) { registry.register(GTE_WIRE_COIL); registry.register(GTE_METAL_CASING); - registry.register(BLOCK_SAWMILL_CONVEYOR); } @Override @@ -106,13 +99,10 @@ public void registerItems(RegistryEvent.Register 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 event) { - GTEToolRecipeHandler.register(); - GTEMaterialInfoLoader.init(); GTEOreDictionaryLoader.init(); GTEMetaTileEntities.init(); } @@ -120,7 +110,6 @@ public void registerRecipesNormal(RegistryEvent.Register event) { @Override public void registerRecipesLowest(RegistryEvent.Register event) { GTERecipe.init(); - GTEWoodRecipe.init(); CEUOverrideRecipe.init(); GTEVanillaOverrideRecipes.init(); } diff --git a/src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java b/src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java index bce17ef6..ffb06910 100644 --- a/src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java +++ b/src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java @@ -22,7 +22,6 @@ public class ExtraTreesModule extends GTEIntegrationSubmodule { @Override public void postInit(FMLPostInitializationEvent event) { ExtraTreesItemsRecipe.init(); - ExtraTreesWoodRecipe.init(); } @Override diff --git a/src/main/java/gtexpert/integration/binnies/extratrees/recipes/ExtraTreesWoodRecipe.java b/src/main/java/gtexpert/integration/binnies/extratrees/recipes/ExtraTreesWoodRecipe.java deleted file mode 100644 index b057d896..00000000 --- a/src/main/java/gtexpert/integration/binnies/extratrees/recipes/ExtraTreesWoodRecipe.java +++ /dev/null @@ -1,110 +0,0 @@ -package gtexpert.integration.binnies.extratrees.recipes; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.util.ResourceLocation; - -import gregtech.api.recipes.ModHandler; -import gregtech.loaders.WoodTypeEntry; - -import gtexpert.api.GTEValues; -import gtexpert.api.util.Mods; -import gtexpert.loaders.GTEWoodRecipeLoader; - -import binnie.extratrees.wood.EnumETLog; - -public class ExtraTreesWoodRecipe { - - private static final String mcModId = Mods.ExtraTrees.name(); - - private static List DEFAULT_ENTRIES; - private static List FIREPROOF_ENTRIES; - - private static List getDefaultEntries() { - if (DEFAULT_ENTRIES == null) initEntries(); - return DEFAULT_ENTRIES; - } - - private static List getFireproofEntries() { - if (FIREPROOF_ENTRIES == null) initEntries(); - return FIREPROOF_ENTRIES; - } - - private static void initEntries() { - DEFAULT_ENTRIES = new ArrayList<>(); - FIREPROOF_ENTRIES = new ArrayList<>(); - int plankId = -1, logId = -1, slabId = -1; - for (int i = 0; i < EnumETLog.values().length; i++) { - String woodName = EnumETLog.values()[i].name().toLowerCase(); - int plankMeta = i % 16; - int logMeta = i % 4; - int slabMeta = i % 8; - if (plankMeta == 0) plankId++; - if (logMeta == 0) logId++; - if (slabMeta == 0) slabId++; - DEFAULT_ENTRIES.add(getEntryByName(woodName, plankId, logId, slabId, plankMeta, logMeta, slabMeta)); - FIREPROOF_ENTRIES - .add(getFireProofEntryByName(woodName, plankId, logId, slabId, plankMeta, logMeta, slabMeta)); - } - } - - private static WoodTypeEntry getEntryByName(String woodName, int plankId, int logId, int slabId, int plankMeta, - int logMeta, int slabMeta) { - return new WoodTypeEntry.Builder(mcModId, woodName) - .planks(Mods.ExtraTrees.getItem("planks." + plankId, 1, plankMeta), null) - .log(Mods.ExtraTrees.getItem("logs." + logId, 1, logMeta)).removeCharcoalRecipe() - .door(Mods.ExtraTrees.getItem("doors." + woodName), null) - .slab(Mods.ExtraTrees.getItem("slabs." + slabId, 1, slabMeta), null) - .fence(Mods.ExtraTrees.getItem("fences." + plankId, 1, plankMeta), null) - .fenceGate(Mods.ExtraTrees.getItem("fence.gates." + woodName), null) - .stairs(Mods.ExtraTrees.getItem("stairs." + woodName), null).addStairsRecipe() - .build(); - } - - private static WoodTypeEntry getFireProofEntryByName(String woodName, int plankId, int logId, int slabId, - int plankMeta, int logMeta, int slabMeta) { - return new WoodTypeEntry.Builder(mcModId, woodName) - .planks(Mods.ExtraTrees.getItem("planks.fireproof." + plankId, 1, plankMeta), - "fireproof_planks_" + woodName) - .log(Mods.ExtraTrees.getItem("logs.fireproof." + logId, 1, logMeta)).removeCharcoalRecipe() - .slab(Mods.ExtraTrees.getItem("slabs.fireproof." + slabId, 1, slabMeta), - "fireproof_slab_" + woodName) - .fence(Mods.ExtraTrees.getItem("fences.fireproof." + plankId, 1, plankMeta), - "fireproof_fence_" + woodName) - .fenceGate(Mods.ExtraTrees.getItem("fence.gates.fireproof." + woodName), - "fireproof_fence_gate_" + woodName) - .stairs(Mods.ExtraTrees.getItem("stairs.fireproof." + woodName), - "fireproof_stair_" + woodName) - .addStairsRecipe() - .build(); - } - - public static void init() { - String[] types = { "_planks", "_slabs", "_fences", "_fence_gates", "_stairs" }; - for (WoodTypeEntry entry : getDefaultEntries()) { - for (String type : types) { - ModHandler.removeRecipeByName(Mods.ExtraTrees.getResource(entry.woodName + type)); - } - - // only for normal woods - ModHandler.removeRecipeByName(Mods.ExtraTrees.getResource(entry.woodName + "_doors")); - - GTEWoodRecipeLoader.registerWoodTypeRecipe(true, entry); - GTEWoodRecipeLoader.addCuttingRecipe(entry); - GTEWoodRecipeLoader.addSawmillRecipe(entry); - } - - for (WoodTypeEntry entry : getFireproofEntries()) { - for (String type : types) { - ModHandler.removeRecipeByName(Mods.ExtraTrees.getResource(entry.woodName + "_fireproof" + type)); - } - - GTEWoodRecipeLoader.registerWoodTypeRecipe(true, entry); - GTEWoodRecipeLoader.addCuttingRecipe(entry); - GTEWoodRecipeLoader.addSawmillRecipe(entry); - - ModHandler.removeRecipeByName(new ResourceLocation(GTEValues.MODID, entry.woodName + "_saw")); - } - } -} diff --git a/src/main/java/gtexpert/integration/ffm/FFMModule.java b/src/main/java/gtexpert/integration/ffm/FFMModule.java index 37dc04d3..ac0735b5 100644 --- a/src/main/java/gtexpert/integration/ffm/FFMModule.java +++ b/src/main/java/gtexpert/integration/ffm/FFMModule.java @@ -27,7 +27,6 @@ public void postInit(FMLPostInitializationEvent event) { FFMItemRecipe.init(); FFMMaterialsRecipe.init(); FFMToolRecipe.init(); - FFMWoodRecipe.init(); CarpenterLoader.initBase(); CarpenterLoader.initMode(); diff --git a/src/main/java/gtexpert/integration/ffm/recipes/FFMWoodRecipe.java b/src/main/java/gtexpert/integration/ffm/recipes/FFMWoodRecipe.java deleted file mode 100644 index e176e639..00000000 --- a/src/main/java/gtexpert/integration/ffm/recipes/FFMWoodRecipe.java +++ /dev/null @@ -1,120 +0,0 @@ -package gtexpert.integration.ffm.recipes; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import net.minecraft.util.ResourceLocation; - -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.common.ConfigHolder; -import gregtech.loaders.WoodTypeEntry; - -import gtexpert.api.GTEValues; -import gtexpert.api.util.Mods; -import gtexpert.loaders.GTEWoodRecipeLoader; - -import forestry.api.arboriculture.EnumForestryWoodType; -import forestry.api.arboriculture.EnumVanillaWoodType; - -public class FFMWoodRecipe { - - private static final String mcModId = Mods.Forestry.name(); - private static List DEFAULT_ENTRIES; - private static List FIREPROOF_ENTRIES; - - private static void initEntries() { - DEFAULT_ENTRIES = new ArrayList<>(); - FIREPROOF_ENTRIES = new ArrayList<>(); - - int plankId = -1, logId = -1, slabId = -1; - List woodNames = Arrays.stream(EnumForestryWoodType.values()).map(Enum::name) - .collect(Collectors.toList()); - for (int i = 0; i < woodNames.size(); i++) { - String woodName = woodNames.get(i).toLowerCase(); - int plankMeta = i % 16; - int logMeta = i % 4; - int slabMeta = i % 8; - if (plankMeta == 0) plankId++; - if (logMeta == 0) logId++; - if (slabMeta == 0) slabId++; - DEFAULT_ENTRIES.add(getEntry(woodName, plankMeta, logMeta, slabMeta, plankId, logId, slabId, "")); - FIREPROOF_ENTRIES - .add(getEntry(woodName, plankMeta, logMeta, slabMeta, plankId, logId, slabId, "fireproof.")); - } - - plankId = -1; - logId = -1; - slabId = -1; - List vanillaWoodNames = Arrays.stream(EnumVanillaWoodType.values()).map(Enum::name) - .collect(Collectors.toList()); - for (int i = 0; i < vanillaWoodNames.size(); i++) { - int plankMeta = i % 16; - int logMeta = i % 4; - int slabMeta = i % 8; - if (plankMeta == 0) plankId++; - if (logMeta == 0) logId++; - if (slabMeta == 0) slabId++; - FIREPROOF_ENTRIES.add(getEntry(vanillaWoodNames.get(i).toLowerCase(), plankMeta, logMeta, slabMeta, plankId, - logId, slabId, "vanilla.fireproof.")); - } - } - - private static WoodTypeEntry getEntry(String woodName, int plankMeta, int logMeta, int slabMeta, int plankId, - int logId, int slabId, String separator) { - return new WoodTypeEntry.Builder(mcModId, woodName) - .planks(Mods.Forestry.getItem("planks." + separator + plankId, 1, plankMeta), null) - .log(Mods.Forestry.getItem("logs." + separator + logId, 1, logMeta)).removeCharcoalRecipe() - .door(Mods.Forestry.getItem("doors." + separator + woodName), null) - .slab(Mods.Forestry.getItem("slabs." + separator + slabId, 1, slabMeta), null) - .fence(Mods.Forestry.getItem("fences." + separator + plankId, 1, plankMeta), null) - .fenceGate(Mods.Forestry.getItem("fence.gates." + separator + woodName), null) - .stairs(Mods.Forestry.getItem("stairs." + separator + woodName), null).addStairsRecipe() - .build(); - } - - public static void init() { - initEntries(); - String[] types = { "planks_", "slabs_", "fences_", "fence_gates_", "stairs_" }; - for (WoodTypeEntry entry : DEFAULT_ENTRIES) { - for (String type : types) { - ModHandler.removeRecipeByName(Mods.Forestry.getResource(type + entry.woodName)); - } - - // only for normal woods - ModHandler.removeRecipeByName(Mods.Forestry.getResource("doors_" + entry.woodName)); - - GTEWoodRecipeLoader.registerWoodTypeRecipe(true, entry); - GTEWoodRecipeLoader.addCuttingRecipe(entry); - GTEWoodRecipeLoader.addSawmillRecipe(entry); - } - - for (WoodTypeEntry entry : FIREPROOF_ENTRIES) { - for (String type : types) { - ModHandler.removeRecipeByName(Mods.Forestry.getResource("fireproof_" + type + entry.woodName)); - } - - GTEWoodRecipeLoader.registerWoodTypeRecipe(true, entry); - GTEWoodRecipeLoader.addCuttingRecipe(entry); - GTEWoodRecipeLoader.addSawmillRecipe(entry); - } - - // Fireproof for vanilla wood - String[] vanillaWoodNames = { "oak", "spruce", "birch", "jungle", "acacia", "dark_oak" }; - for (String woodName : vanillaWoodNames) { - ModHandler.removeRecipeByName(new ResourceLocation(GTEValues.MODID, woodName + "_planks_saw")); - } - - if (!Mods.ForestryCharcoal.isModLoaded()) return; - if (!ConfigHolder.recipes.harderCharcoalRecipe) return; - ModHandler.removeRecipeByName(Mods.Forestry.getResource("wood_pile")); - - RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder() - .input("logWood", 4) - .outputs(Mods.Forestry.getItem("wood_pile")) - .duration(300).EUt(2) - .buildAndRegister(); - } -} diff --git a/src/main/java/gtexpert/integration/gtfo/GTFOModule.java b/src/main/java/gtexpert/integration/gtfo/GTFOModule.java index 26afc21c..b8156c47 100644 --- a/src/main/java/gtexpert/integration/gtfo/GTFOModule.java +++ b/src/main/java/gtexpert/integration/gtfo/GTFOModule.java @@ -9,7 +9,6 @@ import gtexpert.integration.GTEIntegrationSubmodule; import gtexpert.integration.gtfo.recipes.GTFOChemicalRecipe; import gtexpert.integration.gtfo.recipes.GTFOItemsRecipe; -import gtexpert.integration.gtfo.recipes.GTFOWoodRecipe; import gtexpert.modules.GTEModules; @GTEModule( @@ -23,7 +22,6 @@ public class GTFOModule extends GTEIntegrationSubmodule { @Override public void registerRecipesLowest(RegistryEvent.Register event) { GTFOItemsRecipe.init(); - GTFOWoodRecipe.init(); GTFOChemicalRecipe.init(); } } diff --git a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOWoodRecipe.java b/src/main/java/gtexpert/integration/gtfo/recipes/GTFOWoodRecipe.java deleted file mode 100644 index ce56f3ce..00000000 --- a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOWoodRecipe.java +++ /dev/null @@ -1,72 +0,0 @@ -package gtexpert.integration.gtfo.recipes; - -import java.util.Arrays; -import java.util.List; - -import gregtech.loaders.WoodTypeEntry; - -import gtexpert.api.util.Mods; -import gtexpert.loaders.GTEWoodRecipeLoader; - -public class GTFOWoodRecipe { - - private static List DEFAULT_ENTRIES; - - private static List getDefaultEntries() { - if (DEFAULT_ENTRIES == null) { - final String mcModId = Mods.GregTechFoodOption.name(); - return DEFAULT_ENTRIES = Arrays.asList( - new WoodTypeEntry.Builder(mcModId, "banana") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1)) - .registerAllUnificationInfo() - .build(), - new WoodTypeEntry.Builder(mcModId, "orange") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 1), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1, 4)) - .build(), - new WoodTypeEntry.Builder(mcModId, "mango") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 2), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1, 8)) - .build(), - new WoodTypeEntry.Builder(mcModId, "apricot") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 3), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_0", 1, 12)) - .build(), - new WoodTypeEntry.Builder(mcModId, "lemon") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 4), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1)) - .build(), - new WoodTypeEntry.Builder(mcModId, "lime") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 5), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1, 4)) - .build(), - new WoodTypeEntry.Builder(mcModId, "olive") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 6), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1, 8)) - .build(), - new WoodTypeEntry.Builder(mcModId, "rainbowwood") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 7), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_1", 1, 12)) - .build(), - new WoodTypeEntry.Builder(mcModId, "nutmeg") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 8), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_2", 1)) - .build(), - new WoodTypeEntry.Builder(mcModId, "coconut") - .planks(Mods.GregTechFoodOption.getItem("gtfo_planks_0", 1, 9), null) - .log(Mods.GregTechFoodOption.getItem("gtfo_log_2", 1, 4)) - .build()); - } - return DEFAULT_ENTRIES; - } - - public static void init() { - for (WoodTypeEntry entry : getDefaultEntries()) { - GTEWoodRecipeLoader.removePlankRecipe(true, entry, Mods.GregTechFoodOption.name()); - - GTEWoodRecipeLoader.registerWoodTypeRecipe(false, entry); - GTEWoodRecipeLoader.addSawmillRecipe(entry); - } - } -} diff --git a/src/main/java/gtexpert/loaders/GTEMaterialInfoLoader.java b/src/main/java/gtexpert/loaders/GTEMaterialInfoLoader.java deleted file mode 100644 index fdbdac9e..00000000 --- a/src/main/java/gtexpert/loaders/GTEMaterialInfoLoader.java +++ /dev/null @@ -1,21 +0,0 @@ -package gtexpert.loaders; - -import gregtech.api.GTValues; -import gregtech.api.unification.OreDictUnifier; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.ItemMaterialInfo; -import gregtech.api.unification.stack.MaterialStack; -import gregtech.common.ConfigHolder; - -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; - -public class GTEMaterialInfoLoader { - - public static void init() { - OreDictUnifier.registerOre( - GTEMetaBlocks.GTE_METAL_CASING.getItemVariant(GTEBlockMetalCasing.MetalCasingType.SAWMill), - new ItemMaterialInfo(new MaterialStack(Materials.TreatedWood, - (GTValues.M * 8) / ConfigHolder.recipes.casingsPerCraft))); - } -} diff --git a/src/main/java/gtexpert/loaders/GTEWoodRecipeLoader.java b/src/main/java/gtexpert/loaders/GTEWoodRecipeLoader.java deleted file mode 100644 index 80f5c7e4..00000000 --- a/src/main/java/gtexpert/loaders/GTEWoodRecipeLoader.java +++ /dev/null @@ -1,353 +0,0 @@ -package gtexpert.loaders; - -import static gregtech.api.GTValues.*; -import static gregtech.api.unification.ore.OrePrefix.*; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameRegistry; - -import org.jetbrains.annotations.NotNull; - -import gregtech.api.GTValues; -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; -import gregtech.api.util.GTUtility; -import gregtech.common.ConfigHolder; -import gregtech.common.blocks.MetaBlocks; -import gregtech.loaders.WoodTypeEntry; - -import gtexpert.api.recipes.GTERecipeMaps; -import gtexpert.api.util.GTEUtility; -import gtexpert.common.GTEConfigHolder; - -public class GTEWoodRecipeLoader { - - public static void registerWoodTypeRecipe(boolean randomRecipeID, @NotNull WoodTypeEntry entry) { - final String name = entry.woodName; - final String prefix = randomRecipeID ? entry.modid + "_pf" + GTEUtility.generateRandomString(6) : entry.modid; - - if (entry.planks.isEmpty()) { - throw new IllegalStateException("Could not find planks form of WoodTypeEntry '" + name + "'."); - } - - // log-associated recipes - if (!entry.log.isEmpty()) { - // nerf regular log -> plank crafting, if enabled - boolean hasPlanksRecipe = entry.planksRecipeName != null; - - int plank_normal = GTEConfigHolder.ceuOverride.moreNerfPlankCrafting ? 1 : 2; - plank_normal = ConfigHolder.recipes.nerfWoodCrafting ? plank_normal : 4; - int plank_saw = GTEConfigHolder.ceuOverride.moreNerfPlankCrafting ? 2 : 4; - plank_saw = ConfigHolder.recipes.nerfWoodCrafting ? plank_saw : 6; - - if (hasPlanksRecipe) { - ModHandler.addShapelessRecipe(prefix + "_" + entry.planksRecipeName, - GTUtility.copy(plank_normal, entry.planks), entry.log.copy()); - ModHandler.addMirroredShapedRecipe(prefix + "_" + entry.planksRecipeName + "_saw", - GTUtility.copy(plank_saw, entry.planks), "s", "L", - 'L', entry.log.copy()); - } else { - ModHandler.addShapelessRecipe(prefix + "_" + name + "_plank", - GTUtility.copy(plank_normal, entry.planks), entry.log.copy()); - ModHandler.addMirroredShapedRecipe(prefix + "_" + name + "_plank_saw", - GTUtility.copy(plank_saw, entry.planks), "s", "L", - 'L', entry.log.copy()); - } - - // log -> charcoal furnace recipe removal, if enabled - if (ConfigHolder.recipes.harderCharcoalRecipe) { - if (entry.removeCharcoalRecipe) { - final ItemStack outputStack = FurnaceRecipes.instance().getSmeltingResult(entry.log); - if (outputStack.getItem() == Items.COAL && outputStack.getItemDamage() == 1) { - ModHandler.removeFurnaceSmelting(entry.log); - } - } - } else { - if (entry.addCharcoalRecipe) { - GameRegistry.addSmelting(MetaBlocks.RUBBER_LOG, new ItemStack(Items.COAL, 1, 1), 0.15F); - } - } - } - - // door - if (!entry.door.isEmpty()) { - final boolean hasDoorRecipe = entry.doorRecipeName != null; - if (ConfigHolder.recipes.hardWoodRecipes) { - // hard plank -> door crafting - if (hasDoorRecipe) { - ModHandler.removeRecipeByName(new ResourceLocation(entry.modid, entry.doorRecipeName)); - } - ModHandler.addShapedRecipe(hasDoorRecipe ? prefix + entry.doorRecipeName : prefix + name + "_door", - entry.door.copy(), - "PTd", "PRS", "PPs", - 'P', entry.planks.copy(), - 'T', new ItemStack(Blocks.TRAPDOOR), - 'R', new UnificationEntry(ring, Materials.Iron), - 'S', new UnificationEntry(screw, Materials.Iron)); - - // plank -> door assembling - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.TRAPDOOR)) - .inputs(GTUtility.copy(4, entry.planks)) - .fluidInputs(Materials.Iron.getFluid(GTValues.L / 9)) - .outputs(entry.door.copy()) - .duration(400).EUt(4).buildAndRegister(); - } else { - if (!hasDoorRecipe) { - ModHandler.addShapedRecipe(prefix + name + "_door", GTUtility.copy(3, entry.door), - "PP", "PP", "PP", - 'P', entry.planks.copy()); - } - - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(GTUtility.copy(6, entry.planks)) - .outputs(GTUtility.copy(3, entry.door)) - .circuitMeta(6) - .duration(600).EUt(4) - .buildAndRegister(); - } - } - - // stairs - if (!entry.stairs.isEmpty()) { - final boolean hasStairRecipe = entry.stairsRecipeName != null; - if (entry.addStairsCraftingRecipe) { - ModHandler.addShapedRecipe(hasStairRecipe ? prefix + entry.stairsRecipeName : prefix + name + "_stairs", - GTUtility.copy(4, entry.stairs), - "P ", "PP ", "PPP", - 'P', entry.planks.copy()); - } - - // plank -> stairs assembling - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(GTUtility.copy(6, entry.planks)) - .outputs(GTUtility.copy(4, entry.stairs)) - .circuitMeta(7) - .EUt(1).duration(100).buildAndRegister(); - } - - // slab - if (!entry.slab.isEmpty()) { - if (entry.addSlabCraftingRecipe && !ConfigHolder.recipes.hardWoodRecipes) { - ModHandler.addShapedRecipe(prefix + name + "_slab", GTUtility.copy(6, entry.slab), - "PPP", 'P', entry.planks.copy()); - } - - // plank -> slab crafting - ModHandler.addShapedRecipe(prefix + name + "_slab_saw", GTUtility.copy(2, entry.slab), - "sS", 'S', entry.planks.copy()); - - if (ConfigHolder.recipes.hardWoodRecipes && entry.slabRecipeName != null) { - ModHandler.removeRecipeByName(new ResourceLocation(entry.modid, entry.slabRecipeName)); - } - - // plank -> slab cutting - RecipeMaps.CUTTER_RECIPES.recipeBuilder() - .inputs(entry.planks.copy()) - .outputs(GTUtility.copy(2, entry.slab)) - .duration(200).EUt(VA[ULV]) - .buildAndRegister(); - } - - // fence - if (!entry.fence.isEmpty()) { - final boolean hasFenceRecipe = entry.fenceRecipeName != null; - if (ConfigHolder.recipes.hardWoodRecipes) { - // hard plank -> fence crafting - if (hasFenceRecipe) { - ModHandler.removeRecipeByName(new ResourceLocation(entry.modid, entry.fenceRecipeName)); - } - - ModHandler.addShapedRecipe(hasFenceRecipe ? prefix + entry.fenceRecipeName : prefix + name + "_fence", - entry.fence.copy(), - "PSP", "PSP", "PSP", - 'P', entry.planks.copy(), - 'S', entry.getStick()); - } else { - if (!hasFenceRecipe) { - ModHandler.addShapedRecipe(prefix + name + "_fence", GTUtility.copy(3, entry.fence), - "PSP", "PSP", - 'P', entry.planks.copy(), - 'S', entry.getStick()); - } - } - - // plank -> fence assembling - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(entry.planks.copy()) - .outputs(entry.fence.copy()) - .circuitMeta(1) - .duration(100).EUt(4) - .buildAndRegister(); - } - - // fence gate - if (!entry.fenceGate.isEmpty()) { - final boolean hasFenceGateRecipe = entry.fenceGateRecipeName != null; - if (ConfigHolder.recipes.hardWoodRecipes) { - // hard plank -> fence gate crafting - if (hasFenceGateRecipe) { - ModHandler.removeRecipeByName(new ResourceLocation(entry.modid, entry.fenceGateRecipeName)); - } - - ModHandler.addShapedRecipe( - hasFenceGateRecipe ? prefix + entry.fenceGateRecipeName : prefix + name + "_fence_gate", - entry.fenceGate.copy(), - "F F", "SPS", "SPS", - 'P', entry.planks.copy(), - 'S', entry.getStick(), - 'F', new ItemStack(Items.FLINT)); - - ModHandler.addShapedRecipe(prefix + name + "_fence_gate_screws", GTUtility.copy(2, entry.fenceGate), - "IdI", "SPS", "SPS", - 'P', entry.planks, - 'S', entry.getStick(), - 'I', new UnificationEntry(screw, Materials.Iron)); - } else { - if (!hasFenceGateRecipe) { - ModHandler.addShapedRecipe(prefix + name + "_fence_gate", entry.fenceGate.copy(), - "SPS", "SPS", - 'P', entry.planks.copy(), - 'S', entry.getStick()); - } - } - - // plank -> fence gate assembling - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(GTUtility.copy(2, entry.planks)) - .input(entry.getStick().toString(), 2) - .outputs(entry.fenceGate.copy()) - .circuitMeta(2) - .duration(100).EUt(4).buildAndRegister(); - } - - // boat - if (!entry.boat.isEmpty()) { - final boolean hasBoatRecipe = entry.boatRecipeName != null; - if (ConfigHolder.recipes.hardWoodRecipes) { - if (!entry.slab.isEmpty()) { - // hard plank -> boat crafting - if (hasBoatRecipe) { - ModHandler.removeRecipeByName(new ResourceLocation(entry.modid, entry.boatRecipeName)); - } - - ModHandler.addShapedRecipe(hasBoatRecipe ? prefix + entry.boatRecipeName : prefix + name + "_boat", - entry.boat.copy(), - "PHP", "PkP", "SSS", - 'P', entry.planks.copy(), - 'S', entry.slab.copy(), - 'H', new ItemStack(Items.WOODEN_SHOVEL)); - } - } else { - if (!hasBoatRecipe) { - ModHandler.addShapedRecipe(name + "_boat", entry.boat.copy(), - "P P", "PPP", - 'P', entry.planks.copy()); - } - } - - // plank -> boat assembling - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(GTUtility.copy(5, entry.planks)) - .outputs(entry.boat.copy()) - .circuitMeta(15) - .duration(100).EUt(4).buildAndRegister(); - } - } - - public static void addCuttingRecipe(@NotNull WoodTypeEntry entry) { - if (!entry.log.isEmpty()) { - RecipeMaps.CUTTER_RECIPES.recipeBuilder() - .inputs(entry.log.copy()) - .fluidInputs(Materials.Water.getFluid(4)) - .outputs(GTUtility.copy(6, entry.planks)) - .output(dust, Materials.Wood, 2) - .duration(200).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.CUTTER_RECIPES.recipeBuilder() - .inputs(entry.log.copy()) - .fluidInputs(Materials.DistilledWater.getFluid(3)) - .outputs(GTUtility.copy(6, entry.planks)) - .output(dust, Materials.Wood, 2) - .duration(150).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.CUTTER_RECIPES.recipeBuilder() - .inputs(entry.log.copy()) - .fluidInputs(Materials.Lubricant.getFluid(1)) - .outputs(GTUtility.copy(6, entry.planks)) - .output(dust, Materials.Wood, 2) - .duration(100).EUt(VA[ULV]) - .buildAndRegister(); - } - } - - public static void addSawmillRecipe(@NotNull WoodTypeEntry entry) { - if (!entry.log.isEmpty()) { - GTERecipeMaps.SAWMILL_RECIPES.recipeBuilder() - .circuitMeta(1) - .inputs(GTUtility.copy(6, entry.log)) - .fluidInputs(Materials.Water.getFluid(1000)) - .outputs(GTUtility.copy(48, entry.planks)) - .output(dust, Materials.Wood, 12) - .duration(600).EUt(VA[LV]) - .buildAndRegister(); - GTERecipeMaps.SAWMILL_RECIPES.recipeBuilder() - .circuitMeta(2) - .inputs(GTUtility.copy(6, entry.log)) - .fluidInputs(Materials.Water.getFluid(2500)) - .outputs(GTUtility.copy(60, entry.planks)) - .duration(800).EUt(VA[LV]) - .buildAndRegister(); - GTERecipeMaps.SAWMILL_RECIPES.recipeBuilder() - .circuitMeta(3) - .inputs(GTUtility.copy(6, entry.log)) - .fluidInputs(Materials.DistilledWater.getFluid(600)) - .outputs(GTUtility.copy(48, entry.planks)) - .output(dust, Materials.Wood, 12) - .duration(450).EUt(VA[LV]) - .buildAndRegister(); - GTERecipeMaps.SAWMILL_RECIPES.recipeBuilder() - .circuitMeta(4) - .inputs(GTUtility.copy(6, entry.log)) - .fluidInputs(Materials.DistilledWater.getFluid(1500)) - .outputs(GTUtility.copy(60, entry.planks)) - .duration(650).EUt(VA[LV]) - .buildAndRegister(); - GTERecipeMaps.SAWMILL_RECIPES.recipeBuilder() - .circuitMeta(5) - .inputs(GTUtility.copy(6, entry.log)) - .fluidInputs(Materials.Lubricant.getFluid(120)) - .outputs(GTUtility.copy(48, entry.planks)) - .output(dust, Materials.Wood, 12) - .duration(300).EUt(VA[LV]) - .buildAndRegister(); - GTERecipeMaps.SAWMILL_RECIPES.recipeBuilder() - .circuitMeta(6) - .inputs(GTUtility.copy(6, entry.log)) - .fluidInputs(Materials.Lubricant.getFluid(300)) - .outputs(GTUtility.copy(60, entry.planks)) - .duration(500).EUt(VA[LV]) - .buildAndRegister(); - } - } - - public static void removePlankRecipe(boolean removeSawRecipes, @NotNull WoodTypeEntry entry, - @NotNull String otherModId) { - final String name = entry.woodName; - final String prefix = otherModId.isEmpty() ? entry.modid : otherModId; - final boolean hasPlanksRecipe = entry.planksRecipeName != null; - - ModHandler.removeRecipeByName( - new ResourceLocation(prefix, hasPlanksRecipe ? entry.planksRecipeName : name + "_planks")); - - if (!removeSawRecipes) return; - ModHandler.removeRecipeByName( - new ResourceLocation(prefix, hasPlanksRecipe ? entry.planksRecipeName + "_saw" : name + "_planks_saw")); - } -} diff --git a/src/main/java/gtexpert/loaders/recipe/GTERecipe.java b/src/main/java/gtexpert/loaders/recipe/GTERecipe.java index e317f85c..ba684784 100644 --- a/src/main/java/gtexpert/loaders/recipe/GTERecipe.java +++ b/src/main/java/gtexpert/loaders/recipe/GTERecipe.java @@ -824,16 +824,6 @@ private static void blocks() { } } - // Sawmill - ModHandler.addShapedRecipe(true, "gtexpert.machine.sawmill", - GTEMetaTileEntities.SAWMILL.getStackForm(), "SBs", "MHM", "COC", - 'S', new UnificationEntry(screw, Materials.Steel), - 'B', new UnificationEntry(toolHeadBuzzSaw, Materials.Steel), - 'M', MetaItems.ELECTRIC_MOTOR_MV.getStackForm(), - 'H', MetaTileEntities.HULL[MV].getStackForm(), - 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.MV), - 'O', MetaItems.CONVEYOR_MODULE_MV.getStackForm()); - // Large Oil Cracking Unit ModHandler.addShapedRecipe(true, "gtexpert.machine.large_oil_cracking_unit", GTEMetaTileEntities.LARGE_CRACKER.getStackForm(), "PCP", "FSF", "PCP", @@ -909,22 +899,6 @@ private static void blocks() { List materials = new ArrayList<>(GregTechAPI.materialManager.getRegisteredMaterials()); materials.forEach(GTERecipe::voidOreMiner); - // Treated Wood Machine Casing - ModHandler.addShapedRecipe(true, "casing_treated_wood", - GTEMetaBlocks.GTE_METAL_CASING.getItemVariant(GTEBlockMetalCasing.MetalCasingType.SAWMill, - ConfigHolder.recipes.casingsPerCraft), - "PhP", "PFP", "PwP", - 'P', new UnificationEntry(plate, Materials.TreatedWood), - 'F', new UnificationEntry(frameGt, Materials.TreatedWood)); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .circuitMeta(6) - .input(plate, Materials.TreatedWood, 6) - .input(frameGt, Materials.TreatedWood, 1) - .outputs(GTEMetaBlocks.GTE_METAL_CASING - .getItemVariant(GTEBlockMetalCasing.MetalCasingType.SAWMill, 2)) - .duration(50).EUt(VH[LV]) - .buildAndRegister(); - // Void Ore Miner Casing RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .inputs(MetaBlocks.MACHINE_CASING.getItemVariant(BlockMachineCasing.MachineCasingType.ZPM)) @@ -938,16 +912,6 @@ private static void blocks() { ConfigHolder.recipes.casingsPerCraft)) .duration(100).EUt(VA[ZPM]) .buildAndRegister(); - - // Sawmill Conveyor - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(MetaItems.CONVEYOR_MODULE_MV, 1) - .input(frameGt, Materials.TreatedWood, 1) - .input(Items.LEATHER, 3) - .fluidInputs(Materials.Glue.getFluid(100)) - .output(GTEMetaBlocks.BLOCK_SAWMILL_CONVEYOR, 1) - .duration(100).EUt(VA[MV]) - .buildAndRegister(); } private static void tools() { diff --git a/src/main/java/gtexpert/loaders/recipe/GTEWoodRecipe.java b/src/main/java/gtexpert/loaders/recipe/GTEWoodRecipe.java deleted file mode 100644 index 39e794cd..00000000 --- a/src/main/java/gtexpert/loaders/recipe/GTEWoodRecipe.java +++ /dev/null @@ -1,101 +0,0 @@ -package gtexpert.loaders.recipe; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.GTValues; -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.OreDictUnifier; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; -import gregtech.common.ConfigHolder; -import gregtech.common.blocks.MetaBlocks; -import gregtech.common.blocks.wood.BlockGregPlanks; -import gregtech.loaders.WoodTypeEntry; - -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.loaders.GTEWoodRecipeLoader; - -public class GTEWoodRecipe { - - private static List DEFAULT_ENTRIES; - - private static List getDefaultEntries() { - if (DEFAULT_ENTRIES == null) { - final String mcModId = Mods.Vanilla.name(); - return DEFAULT_ENTRIES = Arrays.asList( - new WoodTypeEntry.Builder(mcModId, "oak") - .planks(new ItemStack(Blocks.PLANKS), null) - .log(new ItemStack(Blocks.LOG)) - .build(), - new WoodTypeEntry.Builder(mcModId, "spruce") - .planks(new ItemStack(Blocks.PLANKS, 1, 1), null) - .log(new ItemStack(Blocks.LOG, 1, 1)) - .build(), - new WoodTypeEntry.Builder(mcModId, "birch") - .planks(new ItemStack(Blocks.PLANKS, 1, 2), null) - .log(new ItemStack(Blocks.LOG, 1, 2)) - .build(), - new WoodTypeEntry.Builder(mcModId, "jungle") - .planks(new ItemStack(Blocks.PLANKS, 1, 3), null) - .log(new ItemStack(Blocks.LOG, 1, 3)) - .build(), - new WoodTypeEntry.Builder(mcModId, "acacia") - .planks(new ItemStack(Blocks.PLANKS, 1, 4), null) - .log(new ItemStack(Blocks.LOG2)) - .build(), - new WoodTypeEntry.Builder(mcModId, "dark_oak") - .planks(new ItemStack(Blocks.PLANKS, 1, 5), null) - .log(new ItemStack(Blocks.LOG2, 1, 1)) - .build(), - new WoodTypeEntry.Builder(GTValues.MODID, "rubber") - .planks(MetaBlocks.PLANKS.getItemVariant(BlockGregPlanks.BlockType.RUBBER_PLANK), null) - .log(new ItemStack(MetaBlocks.RUBBER_LOG)) - .build()); - } - return DEFAULT_ENTRIES; - } - - public static void init() { - sticks(); - planks(); - } - - private static void sticks() { - int stick_normal = GTEConfigHolder.ceuOverride.moreNerfStickCrafting ? 1 : 2; - stick_normal = ConfigHolder.recipes.harderRods ? stick_normal : 4; - int stick_saw = GTEConfigHolder.ceuOverride.moreNerfStickCrafting ? 2 : 4; - stick_saw = ConfigHolder.recipes.harderRods ? stick_saw : 6; - - ModHandler.removeRecipeByName(Mods.GregTech.getResource("stick_normal")); - ModHandler.addMirroredShapedRecipe("stick_normal", new ItemStack(Items.STICK, stick_normal), "P", "P", - 'P', new UnificationEntry(plank, Materials.Wood)); - ModHandler.removeRecipeByName(Mods.GregTech.getResource("stick_saw")); - ModHandler.addMirroredShapedRecipe("stick_saw", new ItemStack(Items.STICK, stick_saw), "s", "P", "P", - 'P', new UnificationEntry(plank, Materials.Wood)); - - ModHandler.removeRecipeByName(Mods.GregTech.getResource("treated_wood_stick")); - ModHandler.addMirroredShapedRecipe("treated_wood_stick", - OreDictUnifier.get(stick, Materials.TreatedWood, stick_normal), "P", "P", - 'P', MetaBlocks.PLANKS.getItemVariant(BlockGregPlanks.BlockType.TREATED_PLANK)); - ModHandler.removeRecipeByName(Mods.GregTech.getResource("treated_wood_stick_saw")); - ModHandler.addMirroredShapedRecipe("treated_wood_stick_saw", - OreDictUnifier.get(stick, Materials.TreatedWood, stick_saw), "s", "P", "P", - 'P', MetaBlocks.PLANKS.getItemVariant(BlockGregPlanks.BlockType.TREATED_PLANK)); - } - - private static void planks() { - for (WoodTypeEntry entry : getDefaultEntries()) { - GTEWoodRecipeLoader.removePlankRecipe(true, entry, Mods.GregTech.name()); - GTEWoodRecipeLoader.registerWoodTypeRecipe(false, entry); - GTEWoodRecipeLoader.addSawmillRecipe(entry); - } - } -} diff --git a/src/main/java/gtexpert/loaders/recipe/handlers/GTEToolRecipeHandler.java b/src/main/java/gtexpert/loaders/recipe/handlers/GTEToolRecipeHandler.java deleted file mode 100644 index 105b8880..00000000 --- a/src/main/java/gtexpert/loaders/recipe/handlers/GTEToolRecipeHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package gtexpert.loaders.recipe.handlers; - -import static gregtech.api.unification.material.info.MaterialFlags.*; -import static gregtech.loaders.recipe.handlers.ToolRecipeHandler.addElectricToolRecipe; - -import gregtech.api.items.toolitem.IGTTool; -import gregtech.api.unification.material.Material; -import gregtech.api.unification.material.properties.PropertyKey; -import gregtech.api.unification.material.properties.ToolProperty; -import gregtech.api.unification.ore.OrePrefix; - -import gtexpert.common.items.GTEToolItems; - -public class GTEToolRecipeHandler { - - public static void register() { - OrePrefix.plate.addProcessingHandler(PropertyKey.TOOL, GTEToolRecipeHandler::processElectricTool); - } - - private static void processElectricTool(OrePrefix prefix, Material material, ToolProperty property) { - OrePrefix toolPrefix; - - if (material.hasFlag(GENERATE_PLATE)) { - // Chainsaw - toolPrefix = OrePrefix.toolHeadChainsaw; - addElectricToolRecipe(toolPrefix, material, new IGTTool[] { - GTEToolItems.CHAINSAW_HV, GTEToolItems.CHAINSAW_IV - }); - } - } -} diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang deleted file mode 100644 index 4288f490..00000000 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ /dev/null @@ -1,10 +0,0 @@ -# English by GTModpackTeam - - -# tool -death.attack.chainsaw_hv=%s was massacred by %s -death.attack.chainsaw_iv=%s was massacred by %s -item.gt.tool.chainsaw_hv.name=%s Chainsaw (HV) -item.gt.tool.chainsaw_hv.tooltip=Additions in GTExpert-Core -item.gt.tool.chainsaw_iv.name=%s Chainsaw (IV) -item.gt.tool.chainsaw_iv.tooltip=Additions in GTExpert-Core diff --git a/src/main/resources/assets/gregtech/lang/ja_jp.lang b/src/main/resources/assets/gregtech/lang/ja_jp.lang deleted file mode 100644 index 913276d6..00000000 --- a/src/main/resources/assets/gregtech/lang/ja_jp.lang +++ /dev/null @@ -1,10 +0,0 @@ - - - -# tool -death.attack.chainsaw_hv=%s は %s にチェーンソーを振り回すことは危険だと教えたかった。 -death.attack.chainsaw_iv=%s は %s にチェーンソーを振り回すことは危険だと教えたかった。 -item.gt.tool.chainsaw_hv.name=HVの%s製チェーンソー -item.gt.tool.chainsaw_hv.tooltip=GTExpert-Coreでの追加物です -item.gt.tool.chainsaw_iv.name=IVの%s製チェーンソー -item.gt.tool.chainsaw_iv.tooltip=GTExpert-Coreでの追加物です diff --git a/src/main/resources/assets/gregtech/lang/zh_cn.lang b/src/main/resources/assets/gregtech/lang/zh_cn.lang deleted file mode 100644 index df20b207..00000000 --- a/src/main/resources/assets/gregtech/lang/zh_cn.lang +++ /dev/null @@ -1,10 +0,0 @@ -# Chinese by GTModpackTeam -# 中文翻译由 Quarri6343 翻译。 - -# tool -death.attack.chainsaw_hv=%2$s的链锯切碎了%1$s -death.attack.chainsaw_iv=%2$s的链锯切碎了%1$s -item.gt.tool.chainsaw_hv.name=%s链锯（HV） -item.gt.tool.chainsaw_hv.tooltip=GTExpert-Core 中的其他项目 -item.gt.tool.chainsaw_iv.name=%s链锯（IV） -item.gt.tool.chainsaw_iv.tooltip=GTExpert-Core 中的其他项目 diff --git a/src/main/resources/assets/gregtech/models/item/tools/chainsaw_hv.json b/src/main/resources/assets/gregtech/models/item/tools/chainsaw_hv.json deleted file mode 100644 index 88fcb32b..00000000 --- a/src/main/resources/assets/gregtech/models/item/tools/chainsaw_hv.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "gregtech:items/tools/power_unit_hv", - "layer1": "gregtech:items/tools/chainsaw" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/tools/chainsaw_iv.json b/src/main/resources/assets/gregtech/models/item/tools/chainsaw_iv.json deleted file mode 100644 index 390d6ce9..00000000 --- a/src/main/resources/assets/gregtech/models/item/tools/chainsaw_iv.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "gregtech:items/tools/power_unit_iv", - "layer1": "gregtech:items/tools/chainsaw" - } -} diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_casing.png b/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_casing.png deleted file mode 100644 index 232820c6..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_casing.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_conveyor/belt.png b/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_conveyor/belt.png deleted file mode 100644 index 0b01a842..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_conveyor/belt.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_conveyor/belt.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_conveyor/belt.png.mcmeta deleted file mode 100644 index d3ca55b4..00000000 --- a/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_conveyor/belt.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_conveyor/frame.png b/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_conveyor/frame.png deleted file mode 100644 index 9888fcb6..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/casings/sawmill_conveyor/frame.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_back.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_back.png deleted file mode 100644 index 0a6699ff..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_back.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_back_active.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_back_active.png deleted file mode 100644 index af20b824..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_back_active.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_back_active.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_back_active.png.mcmeta deleted file mode 100644 index dfae8cae..00000000 --- a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_back_active.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front.png deleted file mode 100644 index 71b4efec..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_active.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_active.png deleted file mode 100644 index 9e46f30b..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_active.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_active_emissive.png deleted file mode 100644 index fbc8babe..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_active_emissive.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_emissive.png deleted file mode 100644 index 2673ecbc..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_emissive.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_paused.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_paused.png deleted file mode 100644 index 8f139ba6..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_paused.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_paused_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_paused_emissive.png deleted file mode 100644 index 577f0815..00000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/machines/sawmill/overlay_front_paused_emissive.png and /dev/null differ diff --git a/src/main/resources/assets/gtexpert/blockstates/gte_metal_casing.json b/src/main/resources/assets/gtexpert/blockstates/gte_metal_casing.json index f8d7e9e3..bd5a0076 100644 --- a/src/main/resources/assets/gtexpert/blockstates/gte_metal_casing.json +++ b/src/main/resources/assets/gtexpert/blockstates/gte_metal_casing.json @@ -5,11 +5,6 @@ }, "variants" : { "variant" : { - "sawmill_casing" : { - "textures" : { - "all" : "gregtech:blocks/casings/sawmill_casing" - } - }, "void_ore_miner_casing" : { "textures" : { "all" : "gregtech:blocks/casings/void_ore_miner_casing" diff --git a/src/main/resources/assets/gtexpert/blockstates/sawmill_conveyor.json b/src/main/resources/assets/gtexpert/blockstates/sawmill_conveyor.json deleted file mode 100644 index b27edc60..00000000 --- a/src/main/resources/assets/gtexpert/blockstates/sawmill_conveyor.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker" : 1, - "defaults" : { - "model" : "gtexpert:sawmill_conveyor" - }, - "variants" : { - "facing" : { - "north" : { - "model" : "gtexpert:sawmill_conveyor", - "y" : 0 - }, - "east" : { - "model" : "gtexpert:sawmill_conveyor", - "y" : 90 - }, - "south" : { - "model" : "gtexpert:sawmill_conveyor", - "y" : 180 - }, - "west" : { - "model" : "gtexpert:sawmill_conveyor", - "y" : 270 - } - } - } -} diff --git a/src/main/resources/assets/gtexpert/models/block/sawmill_conveyor.json b/src/main/resources/assets/gtexpert/models/block/sawmill_conveyor.json deleted file mode 100644 index b4c055c4..00000000 --- a/src/main/resources/assets/gtexpert/models/block/sawmill_conveyor.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "parent": "block/block", - "textures" : { - "particle" : "gregtech:blocks/casings/sawmill_conveyor/belt", - "down" : "gregtech:blocks/casings/sawmill_conveyor/frame", - "up" : "gregtech:blocks/casings/sawmill_conveyor/belt", - "north" : "gregtech:blocks/casings/sawmill_conveyor/frame", - "south" : "gregtech:blocks/casings/sawmill_conveyor/frame", - "west" : "gregtech:blocks/casings/sawmill_conveyor/frame", - "east" : "gregtech:blocks/casings/sawmill_conveyor/frame" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 0.1, 16], - "faces": { - "down": { - "uv": [0.0, 0.0, 16.0, 16.0], - "texture": "#down", - "cullface": "down" - }, - "up": { - "uv": [0.0, 16.0, 16.0, 0.0], - "texture": "#down" - } - } - }, - { - "from": [0, 15.9, 0], - "to": [16, 16, 16], - "faces": { - "up": { - "uv": [0.0, 0.0, 16.0, 16.0], - "texture": "#up", - "cullface": "up" - }, - "down": { - "uv": [0.0, 16.0, 16.0, 0.0], - "texture": "#up" - } - } - }, - { - "from": [0, 0, 0], - "to": [16, 16, 0.1], - "faces": { - "north": { - "uv": [0.0, 0.0, 16.0, 16.0], - "texture": "#north", - "cullface": "north" - }, - "south": { - "uv": [16.0, 0.0, 0.0, 16.0], - "texture": "#north" - } - } - }, - { - "from": [0, 0, 15.9], - "to": [16, 16, 16], - "faces": { - "south": { - "uv": [0.0, 0.0, 16.0, 16.0], - "texture": "#south", - "cullface": "south" - }, - "north": { - "uv": [16.0, 0.0, 0.0, 16.0], - "texture": "#south" - } - } - }, - { - "from": [0, 0, 0], - "to": [0.1, 16, 16], - "faces": { - "west": { - "uv": [0.0, 0.0, 16.0, 16.0], - "texture": "#west", - "cullface": "west" - }, - "east": { - "uv": [16.0, 0.0, 0.0, 16.0], - "texture": "#west" - } - } - }, - { - "from": [15.9, 0, 0], - "to": [16, 16, 16], - "faces": { - "east": { - "uv": [0.0, 0.0, 16.0, 16.0], - "texture": "#east", - "cullface": "east" - }, - "west": { - "uv": [16.0, 0.0, 0.0, 16.0], - "texture": "#east" - } - } - } - ] -} diff --git a/src/main/resources/assets/gtexpert/models/item/sawmill_conveyor.json b/src/main/resources/assets/gtexpert/models/item/sawmill_conveyor.json deleted file mode 100644 index 450f54e0..00000000 --- a/src/main/resources/assets/gtexpert/models/item/sawmill_conveyor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent" : "gtexpert:blocks/sawmill_conveyor" -}