From ae50cfb875a017dacfbe25ab8c5920e05c2a9e45 Mon Sep 17 00:00:00 2001 From: tier940 Date: Mon, 9 Feb 2026 23:58:40 +0900 Subject: [PATCH 1/2] Chisel integration move to GTModpackTeam/GTMoreTools --- CHANGELOG.md | 5 + LICENSE | 4 +- buildscript.properties | 1 - dependencies.gradle | 7 - .../chisel/ChiselConfigHolder.java | 20 - .../core/integration/chisel/ChiselModule.java | 40 -- .../integration/chisel/ChiselRecipeMaps.java | 25 - .../core/integration/chisel/ChiselUtil.java | 25 - .../loaders/ChiselOreDictionaryLoader.java | 16 - .../ChiselMetaTileEntities.java | 28 - .../MetaTileEntityAutoChisel.java | 28 - .../chisel/recipes/ChiselBlocksRecipe.java | 503 ------------------ .../chisel/recipes/ChiselToolsRecipe.java | 46 -- .../gtexpert/core/mixins/GTEMixinLoader.java | 1 - .../mixins/chisel/BlockCarvableMixin.java | 49 -- 15 files changed, 7 insertions(+), 791 deletions(-) delete mode 100644 src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/mixins/chisel/BlockCarvableMixin.java diff --git a/CHANGELOG.md b/CHANGELOG.md index c888ef87..8b284c88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.7.0 +- Chisel integration move to [GTModpackTeam/GTMoreTools](https://github.com/GTModpackTeam/GTMoreTools) + +* * * + # 2.6.4 - Re: Improve the VOM UI [#351](https://github.com/GTModpackTeam/GTExpert-Core/pull/351) - The AwakenedFusion category is hidden [#352](https://github.com/GTModpackTeam/GTExpert-Core/pull/352) diff --git a/LICENSE b/LICENSE index 02bbb60b..0a041280 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -162,4 +162,4 @@ General Public License ever published by the Free Software Foundation. whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the -Library. \ No newline at end of file +Library. diff --git a/buildscript.properties b/buildscript.properties index df5b245a..4df0ee4e 100644 --- a/buildscript.properties +++ b/buildscript.properties @@ -31,7 +31,6 @@ debug_thaumenergy = false debug_eio = false debug_deda = false debug_avaritia = false -debug_chisel = false debug_gtfo = false debug_jer = false diff --git a/dependencies.gradle b/dependencies.gradle index 0827a432..dc7f2bb5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -134,13 +134,6 @@ dependencies { runtimeOnly rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:7186329") } - // Debug Chisel: 1.0.2.45 - compileOnly rfg.deobf("curse.maven:chisel-235279:2915375") - if (project.debug_all.toBoolean() || project.debug_chisel.toBoolean()) { - runtimeOnly rfg.deobf("curse.maven:chisel-235279:2915375") - runtimeOnly rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31 - } - // Debug GTFO: 1.12.5 if (project.debug_all.toBoolean() || project.debug_gtfo.toBoolean()) { runtimeOnly rfg.deobf("curse.maven:gregtech-food-option-477021:6472136") diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java deleted file mode 100644 index 87271fc0..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.github.gtexpert.core.integration.chisel; - -import net.minecraftforge.common.config.Config; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.modules.GTEModules; - -@Config.LangKey(GTEValues.MODID + ".config.integration.chisel") -@Config(modid = GTEValues.MODID, - name = GTEValues.MODID + "/integration/" + GTEModules.MODULE_CHISEL, - category = "Chisel") -public class ChiselConfigHolder { - - @Config.Comment({ "Change Chisel recipes to GT recipe standards.", - "CEu's hardToolArmorRecipes to true to reflect.", "Default: false" }) - public static boolean hardToolRecipes = false; - - @Config.Comment({ "Change LED for Project:RED recipes to GT recipe standards.", "Default: false" }) - public static boolean hardLedRecipes = false; -} diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java deleted file mode 100644 index a7f0696f..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.github.gtexpert.core.integration.chisel; - -import net.minecraft.block.Block; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.event.RegistryEvent; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.modules.GTEModule; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; -import com.github.gtexpert.core.integration.chisel.loaders.ChiselOreDictionaryLoader; -import com.github.gtexpert.core.integration.chisel.metatileentities.ChiselMetaTileEntities; -import com.github.gtexpert.core.integration.chisel.recipes.ChiselBlocksRecipe; -import com.github.gtexpert.core.integration.chisel.recipes.ChiselToolsRecipe; -import com.github.gtexpert.core.modules.GTEModules; - -@GTEModule( - moduleID = GTEModules.MODULE_CHISEL, - containerID = GTEValues.MODID, - modDependencies = Mods.Names.CHISEL, - name = "GTExpert Chisel Integration", - description = "Chisel Integration Module") -public class ChiselModule extends GTEIntegrationSubmodule { - - @Override - public void registerBlocks(RegistryEvent.Register event) { - ChiselMetaTileEntities.init(); - } - - @Override - public void registerRecipesNormal(RegistryEvent.Register event) { - ChiselOreDictionaryLoader.init(); - } - - @Override - public void registerRecipesLowest(RegistryEvent.Register event) { - ChiselBlocksRecipe.init(); - ChiselToolsRecipe.init(); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java deleted file mode 100644 index b1bb387b..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.github.gtexpert.core.integration.chisel; - -import gregtech.api.gui.GuiTextures; -import gregtech.api.gui.widgets.ProgressWidget; -import gregtech.api.recipes.RecipeMap; -import gregtech.api.recipes.builders.SimpleRecipeBuilder; -import gregtech.core.sound.GTSoundEvents; - -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - -import crafttweaker.annotations.ZenRegister; -import stanhebben.zenscript.annotations.ZenExpansion; -import stanhebben.zenscript.annotations.ZenProperty; - -@ZenExpansion("mods.gregtech.recipe.RecipeMaps") -@ZenRegister -public class ChiselRecipeMaps { - - @ZenProperty - public static final RecipeMap AUTO_CHISEL_RECIPES = new RecipeMap<>( - "auto_chisel", 2, 9, 0, 0, new SimpleRecipeBuilder(), true) - .setSlotOverlay(false, false, false, GuiTextures.BOXED_BACKGROUND) - .setProgressBar(GTEGuiTextures.PROGRESS_BAR_CHISEL, ProgressWidget.MoveType.HORIZONTAL) - .setSound(GTSoundEvents.FILE_TOOL); -} diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java deleted file mode 100644 index 24582254..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.github.gtexpert.core.integration.chisel; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import team.chisel.api.carving.CarvingUtils; - -public class ChiselUtil { - - public static void addGroup(String groupName) { - CarvingUtils.getChiselRegistry() - .addGroup(CarvingUtils.getDefaultGroupFor(groupName)); - } - - public static void addVariation(String groupName, ItemStack stack) { - CarvingUtils.getChiselRegistry() - .addVariation(groupName, CarvingUtils.variationFor(stack, stack.getItemDamage())); - OreDictionary.registerOre(groupName, stack); - } - - public static void removeVariation(ItemStack stack, String groupName) { - CarvingUtils.getChiselRegistry() - .removeVariation(stack, groupName); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java deleted file mode 100644 index d7544907..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.gtexpert.core.integration.chisel.loaders; - -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; - -public class ChiselOreDictionaryLoader { - - public static void init() { - // craftChisel - GTEUtility.registerOre( - "craftChisel", - Mods.Chisel.getItem("chisel_iron"), - Mods.Chisel.getItem("chisel_diamond"), - Mods.Chisel.getItem("chisel_hitech")); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java deleted file mode 100644 index 24feb158..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.gtexpert.core.integration.chisel.metatileentities; - -import static com.github.gtexpert.core.api.util.GTEUtility.gteId; -import static gregtech.api.GTValues.*; -import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; - -import gregtech.api.util.GTUtility; - -import com.github.gtexpert.core.client.GTETextures; -import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; - -public class ChiselMetaTileEntities { - - public static MetaTileEntityAutoChisel[] AUTO_CHISEL = new MetaTileEntityAutoChisel[3]; - - public static void init() { - // Auto Chisel 11001~11003 - AUTO_CHISEL[0] = registerMetaTileEntity(11001, - new MetaTileEntityAutoChisel(gteId("auto_chisel.lv"), ChiselRecipeMaps.AUTO_CHISEL_RECIPES, - GTETextures.AUTO_CHISEL_OVERLAY, LV, true, GTUtility.defaultTankSizeFunction)); - AUTO_CHISEL[1] = registerMetaTileEntity(11002, - new MetaTileEntityAutoChisel(gteId("auto_chisel.mv"), ChiselRecipeMaps.AUTO_CHISEL_RECIPES, - GTETextures.AUTO_CHISEL_OVERLAY, MV, true, GTUtility.defaultTankSizeFunction)); - AUTO_CHISEL[2] = registerMetaTileEntity(11003, - new MetaTileEntityAutoChisel(gteId("auto_chisel.hv"), ChiselRecipeMaps.AUTO_CHISEL_RECIPES, - GTETextures.AUTO_CHISEL_OVERLAY, HV, true, GTUtility.defaultTankSizeFunction)); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java deleted file mode 100644 index 666fd3fd..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.gtexpert.core.integration.chisel.metatileentities; - -import java.util.function.Function; - -import net.minecraft.util.ResourceLocation; - -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; -import gregtech.api.recipes.RecipeMap; -import gregtech.client.renderer.ICubeRenderer; - -import com.github.gtexpert.core.api.capability.SingleblockRecipeLogicNoCache; -import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; - -public class MetaTileEntityAutoChisel extends GTESimpleMachineMetaTileEntity { - - public MetaTileEntityAutoChisel(ResourceLocation metaTileEntityId, RecipeMap recipeMap, ICubeRenderer renderer, - int tier, boolean hasFrontFacing, Function tankScalingFunction) { - super(metaTileEntityId, recipeMap, renderer, tier, hasFrontFacing, tankScalingFunction); - new SingleblockRecipeLogicNoCache(this, recipeMap, () -> this.energyContainer); - } - - @Override - public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityAutoChisel(metaTileEntityId, workable.getRecipeMap(), renderer, getTier(), - hasFrontFacing(), getTankScalingFunction()); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java deleted file mode 100644 index d1b8e63a..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java +++ /dev/null @@ -1,503 +0,0 @@ -package com.github.gtexpert.core.integration.chisel.recipes; - -import static com.github.gtexpert.core.integration.chisel.metatileentities.ChiselMetaTileEntities.AUTO_CHISEL; -import static gregtech.api.GTValues.*; -import static gregtech.api.unification.ore.OrePrefix.*; -import static gregtech.loaders.recipe.CraftingComponent.*; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.IntStream; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import com.google.common.base.CaseFormat; - -import gregtech.api.recipes.GTRecipeHandler; -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; -import gregtech.common.ConfigHolder; -import gregtech.common.blocks.*; -import gregtech.loaders.recipe.MetaTileEntityLoader; - -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; -import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; -import com.github.gtexpert.core.integration.chisel.ChiselUtil; - -public class ChiselBlocksRecipe { - - public static void init() { - // Bookshelf - GTRecipeHandler.removeRecipesByInputs(RecipeMaps.ASSEMBLER_RECIPES, new ItemStack(Blocks.PLANKS, 6, 0), - new ItemStack(Items.BOOK, 3)); - String[] bookshelf = new String[] { "oak", "spruce", "birch", "jungle", "acacia", "darkoak" }; - for (int i = 0; i < bookshelf.length; i++) { - ChiselUtil.addGroup("bookshelf" + bookshelf[i].toUpperCase()); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.PLANKS, 6, i)) - .inputs(new ItemStack(Items.BOOK, 3)) - .outputs(GTEUtility.getModItem(Mods.Names.CHISEL, "bookshelf_" + bookshelf[i])) - .duration(100).EUt(VH[ULV]) - .buildAndRegister(); - registerAutoChiselRecipe("bookshelf" + bookshelf[i].toUpperCase()); - } - - // Material Blocks - if (ConfigHolder.recipes.disableManualCompression) { - Arrays.asList("charcoal_uncraft", "diamond", "emerald", "redstone", "coal", "uncraft_blocksilver", - "uncraft_blocklead", "uncraft_blocktin", "uncraft_blocksteel", "uncraft_blockplatinum", - "uncraft_blockiron", "uncraft_blockaluminium", "uncraft_blockcobalt", "uncraft_blocknickel", - "uncraft_blockelectrum", "uncraft_blockuranium", "uncraft_blockcopper", "uncraft_blockbronze", - "uncraft_blockinvar", "uncraft_blockgold").forEach( - block -> ModHandler - .removeRecipeByName(Mods.Chisel.getResource(block))); - } - - // Glass Panes - if (ConfigHolder.recipes.hardGlassRecipes) { - Arrays.asList("glass/terrain-glassbubble", "glass/terrain-glassnoborder", "glass/terrain-glassshale", - "glass/terrain-glass-thingrid", "glass/chinese", "glass/japanese", "glass/terrain-glassdungeon", - "glass/terrain-glasslight", "glass/terrain-glass-ornatesteel", "glass/terrain-glass-screen", - "glass/terrain-glass-steelframe", "glass/terrain-glassstone", "glass/terrain-glassstreak", - "glass/terrain-glass-thickgrid", "glass/a1-glasswindow-ironfencemodern", "glass/chrono", - "glass/chinese2", "glass/japanese2").forEach( - block -> ModHandler - .removeRecipeByName(Mods.Chisel.getResource(block))); - } - - // Auto Chisel - ModHandler.removeRecipeByName(Mods.Chisel.getResource("autochisel")); - ModHandler.addShapelessRecipe("normal_auto_chisel", - GTEUtility.getModItem(Mods.Names.CHISEL, "auto_chisel", 1), - AUTO_CHISEL[2].getStackForm()); - ModHandler.addShapelessRecipe("ceu_auto_chisel", AUTO_CHISEL[2].getStackForm(), - GTEUtility.getModItem(Mods.Names.CHISEL, "auto_chisel", 1)); - MetaTileEntityLoader.registerMachineRecipe(true, AUTO_CHISEL, - "BSB", "THT", "MCM", - 'B', new UnificationEntry(toolHeadBuzzSaw, Materials.Invar), - 'S', SENSOR, - 'T', "craftChisel", - 'H', HULL, - 'M', MOTOR, - 'C', CIRCUIT); - - // Lamp - if (ChiselConfigHolder.hardLedRecipes) { - if (Mods.ProjectRedIllumination.isModLoaded()) { - IntStream.range(0, 32) - .mapToObj(i -> GTEUtility.getModItem(Mods.Names.PROJECT_RED_ILLUMINATION, "lamp", 1, i)) - .forEach(ModHandler::removeRecipeByOutput); - } - - int i = 0; - while (i < Materials.CHEMICAL_DYES.length) { - EnumDyeColor color = EnumDyeColor.byMetadata(i); - EnumDyeColor dyeColor = EnumDyeColor.values()[i]; - String colorName = dyeColor.toString().equals("silver") ? - "LightGray" : - CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, dyeColor.getName()); - BlockLamp lamp = MetaBlocks.LAMPS.get(color); - - ChiselUtil.addGroup("lamp" + colorName); - { - int lampMeta = 0; - while (lampMeta < lamp.getItemMetadataStates()) { - if (Mods.ProjectRedIllumination.isModLoaded()) { - ChiselUtil.addVariation("lamp" + colorName, - GTEUtility.getModItem(Mods.Names.PROJECT_RED_ILLUMINATION, "lamp", 1, i)); - } - ChiselUtil.addVariation("lamp" + colorName, - GTEUtility.getModItem(Mods.Names.PROJECT_RED_ILLUMINATION, "lamp", 1, i + 16)); - ChiselUtil.addVariation("lamp" + colorName, new ItemStack(lamp, 1, lampMeta)); - lampMeta++; - } - } - - lamp = MetaBlocks.BORDERLESS_LAMPS.get(color); - ChiselUtil.addGroup("lampBorderless" + colorName); - int lampMeta = 0; - while (lampMeta < lamp.getItemMetadataStates()) { - ChiselUtil.addVariation("lampBorderless" + colorName, new ItemStack(lamp, 1, lampMeta)); - lampMeta++; - } - registerAutoChiselRecipe("lamp" + colorName); - registerAutoChiselRecipe("lampBorderless" + colorName); - i++; - } - } - - // ###################### - // Default chiseling - // ###################### - // Material Blocks - List aluminums = OreDictionary.getOres("blockAluminum"); - aluminums.forEach(alumimun -> OreDictionary.registerOre("blockAluminium", alumimun)); - Arrays.asList("blockAluminium", "blockBronze", "blockCharcoal", "blockCoal", "blockFuelCoke", "blockCobalt", - "blockCopper", "blockDiamond", "blockElectrum", "blockEmerald", "blockGold", "blockInvar", "blockIron", - "blockLapis", "blockLead", "blockNickel", "blockPlatinum", "blockSilver", "blockSteel", "blockTin", - "blockUranium").forEach(ChiselBlocksRecipe::registerAutoChiselRecipe); - - // Andesite - registerAutoChiselRecipe("stoneAndesite"); - - // Antiblock - for (int i = 0; i < Materials.CHEMICAL_DYES.length; i++) { - OreDictionary.registerOre("blockAntiblock", - GTEUtility.getModItem(Mods.Names.CHISEL, "antiblock", 1, i)); - } - registerAutoChiselRecipe("blockAntiblock"); - - // Basalt - registerAutoChiselRecipe("stoneBasalt"); - - // Brick - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("blockBrick", GTEUtility.getModItem(Mods.Names.CHISEL, "bricks", 1, i)); - } - for (int i = 0; i < 10; i++) { - OreDictionary.registerOre("blockBrick", GTEUtility.getModItem(Mods.Names.CHISEL, "bricks1", 1, i)); - } - for (int i = 0; i < 6; i++) { - OreDictionary.registerOre("blockBrick", GTEUtility.getModItem(Mods.Names.CHISEL, "bricks2", 1, i)); - } - registerAutoChiselRecipe("blockBrick"); - - // Brownstone - for (int i = 0; i < 10; i++) { - OreDictionary.registerOre("blockBrownstone", - GTEUtility.getModItem(Mods.Names.CHISEL, "brownstone", 1, i)); - } - registerAutoChiselRecipe("blockBrownstone"); - - // Colored Blocks - for (int i = 0; i < Materials.CHEMICAL_DYES.length; i++) { - EnumDyeColor dyeColor = EnumDyeColor.values()[i]; - String upperColorName = dyeColor.toString().equals("silver") ? - "LightGray" : CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, dyeColor.getName()); - String lowerColorName = dyeColor.toString().equals("silver") ? - "lightgray" : dyeColor.toString().toLowerCase(); - - // Carpet - OreDictionary.registerOre("carpet" + upperColorName, new ItemStack(Blocks.CARPET, 1, i)); - OreDictionary.registerOre("carpet" + upperColorName, - GTEUtility.getModItem(Mods.Names.CHISEL, "carpet_" + lowerColorName)); - OreDictionary.registerOre("carpet" + upperColorName, - GTEUtility.getModItem(Mods.Names.CHISEL, "carpet_" + lowerColorName, 1, 1)); - registerAutoChiselRecipe("carpet" + upperColorName); - - // Concrete - OreDictionary.registerOre("blockConcrete" + upperColorName, new ItemStack(Blocks.CONCRETE, 1, i)); - registerAutoChiselRecipe("blockConcrete" + lowerColorName); - - // Stained Glass - OreDictionary.registerOre("blockChisellableGlass" + upperColorName, - new ItemStack(Blocks.STAINED_GLASS, 1, i)); - for (int j = 0; j < 6; j++) { - OreDictionary.registerOre("blockChisellableGlass" + upperColorName, - GTEUtility.getModItem(Mods.Names.CHISEL, "glassdyed" + lowerColorName, 1, j)); - } - - // Colorless Glass - registerAutoChiselRecipe("blockChisellableGlass" + upperColorName); - OreDictionary.registerOre("blockChisellableGlassColorless", new ItemStack(Blocks.GLASS)); - for (int j = 0; j < 15; j++) { - OreDictionary.registerOre("blockChisellableGlassColorless", - GTEUtility.getModItem(Mods.Names.CHISEL, "glass", 1, j)); - } - OreDictionary.registerOre("blockChisellableGlassColorless", - GTEUtility.getModItem(Mods.Names.CHISEL, "glass1")); - OreDictionary.registerOre("blockChisellableGlassColorless", - GTEUtility.getModItem(Mods.Names.CHISEL, "glass1", 1, 1)); - registerAutoChiselRecipe("blockChisellableGlassColorless"); - - // Glass Pane - registerAutoChiselRecipe("paneGlass" + upperColorName); - registerAutoChiselRecipe("paneGlassColorless"); - - // Wool - OreDictionary.registerOre("blockWool" + upperColorName, - GTEUtility.getModItem(Mods.Names.CHISEL, "wool_" + lowerColorName)); - OreDictionary.registerOre("blockWool" + upperColorName, - GTEUtility.getModItem(Mods.Names.CHISEL, "wool_" + lowerColorName, 1, 1)); - registerAutoChiselRecipe("blockWool" + upperColorName); - } - - // Certus Quartz - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("blockCertus", GTEUtility.getModItem(Mods.Names.CHISEL, "certus", 1, i)); - OreDictionary.registerOre("blockCertus", GTEUtility.getModItem(Mods.Names.CHISEL, "certus1", 1, i)); - } - OreDictionary.registerOre("blockCertus", GTEUtility.getModItem(Mods.Names.CHISEL, "certus2")); - OreDictionary.registerOre("blockCertus", GTEUtility.getModItem(Mods.Names.CHISEL, "certus2", 1, 1)); - registerAutoChiselRecipe("blockCertus"); - - // Cloud - for (int i = 0; i < 5; i++) { - OreDictionary.registerOre("blockCloud", GTEUtility.getModItem(Mods.Names.CHISEL, "cloud", 1, i)); - } - registerAutoChiselRecipe("blockCloud"); - - // Cobblestone - registerAutoChiselRecipe("cobblestone"); - - // Moss Stone - OreDictionary.registerOre("blockMossy", new ItemStack(Blocks.MOSSY_COBBLESTONE)); - registerAutoChiselRecipe("blockMossy"); - - // Diorite - registerAutoChiselRecipe("stoneDiorite"); - - // Dirt - registerAutoChiselRecipe("dirt"); - - // Endstone - OreDictionary.registerOre("endstone", new ItemStack(Blocks.END_BRICKS)); - registerAutoChiselRecipe("endstone"); - - // Factory Block - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("blockFactory", GTEUtility.getModItem(Mods.Names.CHISEL, "factory", 1, i)); - OreDictionary.registerOre("blockFactory", GTEUtility.getModItem(Mods.Names.CHISEL, "technical", 1, i)); - } - for (int i = 0; i < 5; i++) { - OreDictionary.registerOre("blockFactory", GTEUtility.getModItem(Mods.Names.CHISEL, "factory1", 1, i)); - OreDictionary.registerOre("blockFactory", - GTEUtility.getModItem(Mods.Names.CHISEL, "technical1", 1, i)); - } - for (int i = 0; i < 9; i++) { - OreDictionary.registerOre("blockFactory", - GTEUtility.getModItem(Mods.Names.CHISEL, "technicalnew", 1, i)); - } - registerAutoChiselRecipe("blockFactory"); - - // Futura Block - for (int i = 0; i < 6; i++) { - OreDictionary.registerOre("blockFutura", GTEUtility.getModItem(Mods.Names.CHISEL, "futura", 1, i)); - } - registerAutoChiselRecipe("blockFutura"); - - // Glowstone - registerAutoChiselRecipe("glowstone"); - - // Granite - registerAutoChiselRecipe("stoneGranite"); - - // Terracotta - OreDictionary.registerOre("hardenedClay", new ItemStack(Blocks.HARDENED_CLAY)); - registerAutoChiselRecipe("hardenedClay"); - - // Ice - registerAutoChiselRecipe("blockIce"); - - // Iron Bars - for (int i = 0; i < 13; i++) { - OreDictionary.registerOre("barsIron", GTEUtility.getModItem(Mods.Names.CHISEL, "ironpane", 1, i)); - } - registerAutoChiselRecipe("barsIron"); - - // Laboratory Block - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("blockLaboratory", - GTEUtility.getModItem(Mods.Names.CHISEL, "laboratory", 1, i)); - } - registerAutoChiselRecipe("blockLaboratory"); - - // Lavastone - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("blockLavastone", - GTEUtility.getModItem(Mods.Names.CHISEL, "lavastone", 1, i)); - OreDictionary.registerOre("blockLavastone", - GTEUtility.getModItem(Mods.Names.CHISEL, "lavastone1", 1, i)); - } - OreDictionary.registerOre("blockLavastone", GTEUtility.getModItem(Mods.Names.CHISEL, "lavastone2")); - registerAutoChiselRecipe("blockLavastone"); - - // Limestone - registerAutoChiselRecipe("stoneLimestone"); - - // Marble - registerAutoChiselRecipe("stoneMarble"); - - // Nether Brick - OreDictionary.registerOre("brickNether", new ItemStack(Blocks.NETHER_BRICK)); - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("brickNether", - GTEUtility.getModItem(Mods.Names.CHISEL, "netherbrick", 1, i)); - } - registerAutoChiselRecipe("brickNether"); - - // Netherrack - registerAutoChiselRecipe("netherrack"); - - // Obsidian - registerAutoChiselRecipe("obsidian"); - - // Paper Wall - for (int i = 0; i < 9; i++) { - OreDictionary.registerOre("blockPaperWall", GTEUtility.getModItem(Mods.Names.CHISEL, "paper", 1, i)); - } - registerAutoChiselRecipe("blockPaperWall"); - - // Planks - for (int i = 0; i < 15; i++) { - OreDictionary.registerOre("plankWoodOak", - GTEUtility.getModItem(Mods.Names.CHISEL, "planks-oak", 1, i)); - OreDictionary.registerOre("plankWoodSpruce", - GTEUtility.getModItem(Mods.Names.CHISEL, "planks-spruce", 1, i)); - OreDictionary.registerOre("plankWoodBirch", - GTEUtility.getModItem(Mods.Names.CHISEL, "planks-birch", 1, i)); - OreDictionary.registerOre("plankWoodJungle", - GTEUtility.getModItem(Mods.Names.CHISEL, "planks-jungle", 1, i)); - OreDictionary.registerOre("plankWoodAcacia", - GTEUtility.getModItem(Mods.Names.CHISEL, "planks-acacia", 1, i)); - OreDictionary.registerOre("plankWoodDarkOak", - GTEUtility.getModItem(Mods.Names.CHISEL, "planks-dark-oak", 1, i)); - } - OreDictionary.registerOre("plankWoodOak", new ItemStack(Blocks.PLANKS, 1)); - registerAutoChiselRecipe("plankWoodOak"); - OreDictionary.registerOre("plankWoodSpruce", new ItemStack(Blocks.PLANKS, 1, 1)); - registerAutoChiselRecipe("plankWoodSpruce"); - OreDictionary.registerOre("plankWoodBirch", new ItemStack(Blocks.PLANKS, 1, 2)); - registerAutoChiselRecipe("plankWoodBirch"); - OreDictionary.registerOre("plankWoodJungle", new ItemStack(Blocks.PLANKS, 1, 3)); - registerAutoChiselRecipe("plankWoodJungle"); - OreDictionary.registerOre("plankWoodAcacia", new ItemStack(Blocks.PLANKS, 1, 4)); - registerAutoChiselRecipe("plankWoodAcacia"); - OreDictionary.registerOre("plankWoodDarkOak", new ItemStack(Blocks.PLANKS, 1, 5)); - registerAutoChiselRecipe("plankWoodDarkOak"); - - // Prismarine - OreDictionary.registerOre("prismarineBrick", new ItemStack(Blocks.PRISMARINE, 1, 1)); - registerAutoChiselRecipe("prismarineBrick"); - - // Purpur - OreDictionary.registerOre("blockPurpur", new ItemStack(Blocks.PURPUR_BLOCK)); - OreDictionary.registerOre("blockPurpur", new ItemStack(Blocks.PURPUR_PILLAR)); - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("blockPurpur", GTEUtility.getModItem(Mods.Names.CHISEL, "purpur", 1, i)); - } - for (int i = 0; i < 10; i++) { - OreDictionary.registerOre("blockPurpur", GTEUtility.getModItem(Mods.Names.CHISEL, "purpur1", 1, i)); - } - for (int i = 0; i < 5; i++) { - OreDictionary.registerOre("blockPurpur", GTEUtility.getModItem(Mods.Names.CHISEL, "purpur2", 1, i)); - } - registerAutoChiselRecipe("blockPurpur"); - - // Quartz Block - OreDictionary.registerOre("blockQuartz", new ItemStack(Blocks.QUARTZ_BLOCK, 1, 1)); - OreDictionary.registerOre("blockQuartz", new ItemStack(Blocks.QUARTZ_BLOCK, 1, 2)); - registerAutoChiselRecipe("blockQuartz"); - - // Redstone Block - registerAutoChiselRecipe("blockRedstone"); - - // Red Sandstone - for (int i = 0; i < 2; i++) { - OreDictionary.registerOre("sandstoneRed", new ItemStack(Blocks.RED_SANDSTONE, 1, i)); - } - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("sandstoneRed", - GTEUtility.getModItem(Mods.Names.CHISEL, "sandstonered", 1, i)); - OreDictionary.registerOre("sandstoneRed", - GTEUtility.getModItem(Mods.Names.CHISEL, "sandstonered-scribbles", 1, i)); - } - for (int i = 0; i < 10; i++) { - OreDictionary.registerOre("sandstoneRed", - GTEUtility.getModItem(Mods.Names.CHISEL, "sandstonered1", 1, i)); - } - for (int i = 0; i < 8; i++) { - OreDictionary.registerOre("sandstoneRed", - GTEUtility.getModItem(Mods.Names.CHISEL, "sandstonered2", 1, i)); - } - registerAutoChiselRecipe("sandstoneRed"); - - // Sandstone - for (int i = 0; i < 2; i++) { - OreDictionary.registerOre("sandstoneYellow", new ItemStack(Blocks.SANDSTONE, 1, i)); - } - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("sandstoneYellow", - GTEUtility.getModItem(Mods.Names.CHISEL, "sandstoneyellow", 1, i)); - OreDictionary.registerOre("sandstoneYellow", - GTEUtility.getModItem(Mods.Names.CHISEL, "sandstone-scribbles", 1, i)); - } - for (int i = 0; i < 10; i++) { - OreDictionary.registerOre("sandstoneYellow", - GTEUtility.getModItem(Mods.Names.CHISEL, "sandstoneyellow1", 1, i)); - } - for (int i = 0; i < 8; i++) { - OreDictionary.registerOre("sandstoneYellow", - GTEUtility.getModItem(Mods.Names.CHISEL, "sandstoneyellow2", 1, i)); - } - registerAutoChiselRecipe("sandstoneYellow"); - - // Stone - for (int i = 0; i < 4; i++) { - OreDictionary.registerOre("stone", new ItemStack(Blocks.STONEBRICK, 1, i)); - } - registerAutoChiselRecipe("stone"); - - // Temple Block - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("blockTemple", GTEUtility.getModItem(Mods.Names.CHISEL, "temple", 1, i)); - OreDictionary.registerOre("blockTemple", - GTEUtility.getModItem(Mods.Names.CHISEL, "templemossy", 1, i)); - } - registerAutoChiselRecipe("blockTemple"); - - // Tyrian - for (int i = 0; i < 15; i++) { - OreDictionary.registerOre("blockTyrian", GTEUtility.getModItem(Mods.Names.CHISEL, "tyrian", 1, i)); - } - registerAutoChiselRecipe("blockTyrian"); - - // Valentines' Block - for (int i = 0; i < 10; i++) { - OreDictionary.registerOre("blockValentine", - GTEUtility.getModItem(Mods.Names.CHISEL, "valentines", 1, i)); - } - registerAutoChiselRecipe("blockValentine"); - - // Voidstone - for (int i = 0; i < 8; i++) { - OreDictionary.registerOre("blockVoidstone", - GTEUtility.getModItem(Mods.Names.CHISEL, "voidstone", 1, i)); - OreDictionary.registerOre("blockVoidstone", - GTEUtility.getModItem(Mods.Names.CHISEL, "energizedvoidstone", 1, i)); - } - for (int i = 0; i < 15; i++) { - OreDictionary.registerOre("blockVoidstone", - GTEUtility.getModItem(Mods.Names.CHISEL, "voidstonerunic", 1, i)); - } - registerAutoChiselRecipe("blockVoidstone"); - - // Waterstone - for (int i = 0; i < 16; i++) { - OreDictionary.registerOre("blockWaterstone", - GTEUtility.getModItem(Mods.Names.CHISEL, "waterstone", 1, i)); - OreDictionary.registerOre("blockWaterstone", - GTEUtility.getModItem(Mods.Names.CHISEL, "waterstone1", 1, i)); - } - OreDictionary.registerOre("blockWaterstone", GTEUtility.getModItem(Mods.Names.CHISEL, "waterstone")); - registerAutoChiselRecipe("blockWaterstone"); - } - - private static void registerAutoChiselRecipe(String oreDictName) { - List targets = OreDictionary.getOres(oreDictName); - targets.forEach(target -> ChiselRecipeMaps.AUTO_CHISEL_RECIPES.recipeBuilder() - .input(oreDictName) - .notConsumable(target) - .outputs(target) - .duration(10).EUt(VH[ULV]) - .buildAndRegister()); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java deleted file mode 100644 index fb968370..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.github.gtexpert.core.integration.chisel.recipes; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; -import gregtech.common.ConfigHolder; - -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; - -public class ChiselToolsRecipe { - - public static void init() { - if (ConfigHolder.recipes.hardToolArmorRecipes && ChiselConfigHolder.hardToolRecipes) { - // Iron Chisel - ModHandler.removeRecipeByName(Mods.Chisel.getResource("chisel_iron")); - ModHandler.addShapedRecipe(true, "chisel_iron", - GTEUtility.getModItem(Mods.Names.CHISEL, "chisel_iron"), - "fPP", " CP", "S h", - 'P', new UnificationEntry(plate, Materials.Iron), - 'C', new UnificationEntry(screw, Materials.Iron), - 'S', new UnificationEntry(stick, Materials.Bronze)); - - // Diamond Chisel - ModHandler.removeRecipeByName(Mods.Chisel.getResource("chisel_diamond")); - ModHandler.addShapedRecipe(true, "chisel_diamond", - GTEUtility.getModItem(Mods.Names.CHISEL, "chisel_diamond"), - "fPP", " CP", "S h", - 'P', new UnificationEntry(plate, Materials.Diamond), - 'C', GTEUtility.getModItem(Mods.Names.CHISEL, "chisel_iron"), - 'S', new UnificationEntry(stick, Materials.RoseGold)); - - // iChisel - ModHandler.removeRecipeByName(Mods.Chisel.getResource("chisel_hitech")); - ModHandler.addShapedRecipe(true, "chisel_hitech", - GTEUtility.getModItem(Mods.Names.CHISEL, "chisel_hitech"), - "fPP", " CP", "S h", - 'P', new UnificationEntry(plate, Materials.Diamond), - 'C', GTEUtility.getModItem(Mods.Names.CHISEL, "chisel_diamond"), - 'S', new UnificationEntry(stick, Materials.StainlessSteel)); - } - } -} diff --git a/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java index 86f0f090..f8de01c8 100644 --- a/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java +++ b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java @@ -19,7 +19,6 @@ public class GTEMixinLoader implements ILateMixinLoader { public static final Map modMixinsConfig = new ImmutableMap.Builder() - .put(Mods.Names.CHISEL, true) .put(Mods.Names.DRACONIC_EVOLUTION, true) .put(Mods.Names.DRACONIC_ADDITIONS, true) .put(Mods.Names.GREGTECH, true) diff --git a/src/main/java/com/github/gtexpert/core/mixins/chisel/BlockCarvableMixin.java b/src/main/java/com/github/gtexpert/core/mixins/chisel/BlockCarvableMixin.java deleted file mode 100644 index b6750291..00000000 --- a/src/main/java/com/github/gtexpert/core/mixins/chisel/BlockCarvableMixin.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.github.gtexpert.core.mixins.chisel; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.util.BlockRenderLayer; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import team.chisel.api.block.VariationData; -import team.chisel.common.block.BlockCarvable; - -/** - * Mixin to add harvest level information to Chisel's carvable blocks. - *

- * Sets appropriate harvest tools (pickaxe, axe, shovel) based on block material type, - * enabling proper tool requirements for breaking these blocks. - */ -@Mixin(value = BlockCarvable.class, remap = false) -public abstract class BlockCarvableMixin extends Block { - - protected BlockCarvableMixin(Material materialIn) { - super(materialIn); - } - - /** - * Sets the harvest level for carvable blocks based on their material type. - *

    - *
  • Pickaxe: Rock, Iron, Anvil, Ice
    • - *
  • Axe: Wood
    • - *
  • Shovel: Ground, Sand, Clay
    • - *
- */ - @Inject(method = "(Lnet/minecraft/block/material/Material;Lnet/minecraft/util/BlockRenderLayer;II[Lteam/chisel/api/block/VariationData;)V", - at = @At("RETURN")) - private void gtexpert$setHarvestLevel(Material material, BlockRenderLayer layer, int index, int max, - VariationData[] variations, CallbackInfo ci) { - if (material == Material.ROCK || material == Material.IRON || material == Material.ANVIL || - material == Material.ICE || material == Material.PACKED_ICE) { - this.setHarvestLevel("pickaxe", 0); - } else if (material == Material.WOOD) { - this.setHarvestLevel("axe", 0); - } else if (material == Material.GROUND || material == Material.SAND || material == Material.CLAY) { - this.setHarvestLevel("shovel", 0); - } - } -} From fadca5a2eb0ee0b7208f839f9badc790b8f72afd Mon Sep 17 00:00:00 2001 From: tier940 Date: Tue, 10 Feb 2026 00:04:51 +0900 Subject: [PATCH 2/2] fix --- .github/workflows/publish.yml | 1 - .../com/github/gtexpert/core/GTExpertMod.java | 5 ++-- .../gtexpert/core/api/gui/GTEGuiTextures.java | 2 -- .../gtexpert/core/client/GTETextures.java | 1 - .../core/integration/ctm/IFacadeWrapper.java | 26 ------------------- .../resources/assets/gtexpert/lang/en_us.lang | 10 ------- .../resources/assets/gtexpert/lang/ja_jp.lang | 9 ------- .../resources/mixins.gtexpert.chisel.json | 10 ------- 8 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java delete mode 100644 src/main/resources/mixins.gtexpert.chisel.json diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e2eed445..bd633500 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -98,7 +98,6 @@ jobs: ender-io-conduits(recommended) ender-io-ae2-conduits(recommended) gregtech-food-option(recommended) - chisel(recommended) extracpus(recommended) draconic-evolution(recommended) draconicadditions(recommended) diff --git a/src/main/java/com/github/gtexpert/core/GTExpertMod.java b/src/main/java/com/github/gtexpert/core/GTExpertMod.java index b4cc6b0b..a199fa9d 100644 --- a/src/main/java/com/github/gtexpert/core/GTExpertMod.java +++ b/src/main/java/com/github/gtexpert/core/GTExpertMod.java @@ -45,9 +45,8 @@ "after:" + Mods.Names.ENDER_IO + ";" + "after:" + Mods.Names.ENDER_ENDERGY + ";" + "after:" + Mods.Names.ENDER_MACHINES + ";" + "after:" + Mods.Names.ENDER_CONDUITS + ";" + "after:" + Mods.Names.ENDER_AE2_CONDUITS + ";" + "after:" + Mods.Names.DRACONIC_EVOLUTION + ";" + - "after:" + Mods.Names.DRACONIC_ADDITIONS + ";" + "after:" + Mods.Names.CHISEL + ";" + - "after:" + Mods.Names.AVARITIA + ";" + "after:" + Mods.Names.THAUMCRAFT + ";" + - "after:" + Mods.Names.THAUMIC_ENERGISTICS + ";") + "after:" + Mods.Names.DRACONIC_ADDITIONS + ";" + "after:" + Mods.Names.AVARITIA + ";" + + "after:" + Mods.Names.THAUMCRAFT + ";" + "after:" + Mods.Names.THAUMIC_ENERGISTICS + ";") @Mod.EventBusSubscriber(modid = GTEValues.MODID) public class GTExpertMod { diff --git a/src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java b/src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java index 63a13fb5..1580f61c 100644 --- a/src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java +++ b/src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java @@ -21,8 +21,6 @@ public class GTEGuiTextures { .fullImage("textures/gui/progress_bar/progress_bar_void_fuel.png"); public static final TextureArea PROGRESS_BAR_VOID_ENDER = TextureArea .fullImage("textures/gui/progress_bar/progress_bar_void_ender.png"); - public static final TextureArea PROGRESS_BAR_CHISEL = TextureArea - .fullImage("textures/gui/progress_bar/progress_bar_chisel.png"); public static final TextureArea SOULVIAL_EMPTY_OVRELAY = TextureArea .fullImage("textures/gui/overlay/soul_vial_e_overlay.png"); public static final TextureArea SOULVIAL_FULL_OVERLAY = TextureArea diff --git a/src/main/java/com/github/gtexpert/core/client/GTETextures.java b/src/main/java/com/github/gtexpert/core/client/GTETextures.java index 6bee8c4b..56c1746d 100644 --- a/src/main/java/com/github/gtexpert/core/client/GTETextures.java +++ b/src/main/java/com/github/gtexpert/core/client/GTETextures.java @@ -14,7 +14,6 @@ public class GTETextures { public static SimpleOverlayRenderer VOID_ORE_MINER_CASING; // Ender IO - public static OrientedOverlayRenderer AUTO_CHISEL_OVERLAY = new OrientedOverlayRenderer("machines/auto_chisel"); public static OrientedOverlayRenderer VIAL_EXTRACTOR_OVERLAY = new OrientedOverlayRenderer( "machines/vial_extractor"); public static OrientedOverlayRenderer SLICE_N_SPLICE_OVERLAY = new OrientedOverlayRenderer( diff --git a/src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java b/src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java deleted file mode 100644 index ed7f5b41..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.github.gtexpert.core.integration.ctm; - -import javax.annotation.Nonnull; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.common.Optional; - -import gregtech.api.GTValues; - -import team.chisel.ctm.api.IFacade; - -@Optional.Interface(modid = GTValues.MODID_CTM, iface = "team.chisel.ctm.api.IFacade") -public interface IFacadeWrapper extends IFacade { - - @Nonnull - @Override - IBlockState getFacade(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side); - - @Nonnull - @Override - IBlockState getFacade(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side, - @Nonnull BlockPos connection); -} diff --git a/src/main/resources/assets/gtexpert/lang/en_us.lang b/src/main/resources/assets/gtexpert/lang/en_us.lang index e5db74f6..3924aac5 100644 --- a/src/main/resources/assets/gtexpert/lang/en_us.lang +++ b/src/main/resources/assets/gtexpert/lang/en_us.lang @@ -38,14 +38,6 @@ gtexpert.machine.void_fluid_pump.tooltip.3=§dAuthor:§f @MrKono gtexpert.machine.void_fluid_pump.tooltip.overclock=§aQuadratic Overclock:§7 Higher tiers are more efficient (e.g., +1 tier = 4x, +2 = 9x, +3 = 16x) # singleblock -# Auto Chisel -gtexpert.machine.auto_chisel.lv.name=Basic Auto Chisel -gtexpert.machine.auto_chisel.lv.tooltip=Your ideal, we will sculpt it./nMaterial in the left, chiseling to the right. See JEI's Chiseling page for details./n§dAuthor:§f @tier940 -gtexpert.machine.auto_chisel.mv.name=Advanced Auto Chisel -gtexpert.machine.auto_chisel.mv.tooltip=Your ideal, we will sculpt it/nMaterial in the left, chiseling to the right. See JEI's Chiseling page for details./n§dAuthor:§f @tier940 -gtexpert.machine.auto_chisel.hv.name=Advanced Auto Chisel II -gtexpert.machine.auto_chisel.hv.tooltip=Your ideal, we will sculpt it/nMaterial in the left, chiseling to the right. See JEI's Chiseling page for details./n§dAuthor:§f @tier940 - # Vial Extractor gtexpert.machine.vial_extractor.lv.name=Basic Vial Extractor gtexpert.machine.vial_extractor.lv.tooltip=Soul of a Lost Undead?/n§dAuthor:§f @tier940 @@ -229,7 +221,6 @@ recipemap.sawmill.name=Saw Mill recipemap.vial_extractor.name=Vial Extractor recipemap.slice_n_splice.name=Slice'N'Splice recipemap.soul_binder.name=Soul Binder -recipemap.auto_chisel.name=Auto Chisel recipemap.void_ore_miner.name=Void Ore Miner recipemap.draconium_fusion.name=Draconic Fusion Crafter recipemap.awakened_draconium_fusion.name=Draconic Fusion Crafter @@ -266,7 +257,6 @@ gtexpert.multiblock.void_fluid_pump.multiplier=Production Multiplier: %s gtexpert.config.gtexpert=GTExpert-Core gtexpert.config.integration.ae=Applied Energistics 2 gtexpert.config.integration.aeadditions=AE Additions -gtexpert.config.integration.chisel=Chisel gtexpert.config.integration.deda=Draconic Evolution & Draconic Additions gtexpert.config.integration.eio=Ender IO gtexpert.config.integration.extracpus=Extra CPUs diff --git a/src/main/resources/assets/gtexpert/lang/ja_jp.lang b/src/main/resources/assets/gtexpert/lang/ja_jp.lang index bfcd9b39..f70b6813 100644 --- a/src/main/resources/assets/gtexpert/lang/ja_jp.lang +++ b/src/main/resources/assets/gtexpert/lang/ja_jp.lang @@ -38,14 +38,6 @@ gtexpert.machine.void_fluid_pump.tooltip.3=§d作者:§f @MrKono gtexpert.machine.void_fluid_pump.tooltip.overclock=§a二次オーバークロック:§7 高ティアほど効率向上 (例: +1ティア = 4倍, +2 = 9倍, +3 = 16倍) # singleblock -# Auto Chisel -gtexpert.machine.auto_chisel.lv.name=基本型自動彫刻機 -gtexpert.machine.auto_chisel.lv.tooltip=あなたの理想、彫刻します/n左が素材、右が彫刻型。詳しくはJEIのChiselingページをご覧ください。/n§d作者:§f @tier940 -gtexpert.machine.auto_chisel.mv.name=発展型自動彫刻機 -gtexpert.machine.auto_chisel.mv.tooltip=あなたの理想、彫刻します/n左が素材、右が彫刻型。詳しくはJEIのChiselingページをご覧ください。/n§d作者:§f @tier940 -gtexpert.machine.auto_chisel.hv.name=発展型自動彫刻機 II -gtexpert.machine.auto_chisel.hv.tooltip=あなたの理想、彫刻します/n左が素材、右が彫刻型。詳しくはJEIのChiselingページをご覧ください。/n§d作者:§f @tier940 - # Vial Extractor gtexpert.machine.vial_extractor.lv.name=基本型魂抽出器 gtexpert.machine.vial_extractor.lv.tooltip=故も知らぬ不死のソウル?/n§d作者:§f @tier940 @@ -228,7 +220,6 @@ recipemap.sawmill.name=製材機 recipemap.vial_extractor.name=魂抽出器 recipemap.slice_n_splice.name=頭顱調整機 recipemap.soul_binder.name=魂拘束器 -recipemap.auto_chisel.name=自動彫刻機 recipemap.void_ore_miner.name=亜空間型鉱石採掘機 recipemap.draconium_fusion.name=ドラコニック融合機 recipemap.awakened_draconium_fusion.name=ドラコニック融合機 diff --git a/src/main/resources/mixins.gtexpert.chisel.json b/src/main/resources/mixins.gtexpert.chisel.json deleted file mode 100644 index 80ea5410..00000000 --- a/src/main/resources/mixins.gtexpert.chisel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "package": "com.github.gtexpert.core.mixins.chisel", - "refmap": "mixins.gtexpert.refmap.json", - "target": "@env(DEFAULT)", - "minVersion": "0.8", - "compatibilityLevel": "JAVA_8", - "mixins": [ - "BlockCarvableMixin" - ] -} \ No newline at end of file