From fe12d7078b55f2d19d225ae2b9f875d7922ceb8e Mon Sep 17 00:00:00 2001 From: Ethryan <3237986+Ethryan@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:29:39 +0100 Subject: [PATCH 1/2] Travellers Gear Removal --- .../coremod/DreamClassTransformer.java | 2 - .../TravellersGearTransformer.java | 57 ---------- .../com/dreammaster/scripts/ScriptLoader.java | 1 - .../scripts/ScriptTravellersGear.java | 105 ------------------ 4 files changed, 165 deletions(-) delete mode 100644 src/main/java/com/dreammaster/coremod/transformers/recipenukers/TravellersGearTransformer.java delete mode 100644 src/main/java/com/dreammaster/scripts/ScriptTravellersGear.java diff --git a/src/main/java/com/dreammaster/coremod/DreamClassTransformer.java b/src/main/java/com/dreammaster/coremod/DreamClassTransformer.java index 7187792a11..152201158e 100644 --- a/src/main/java/com/dreammaster/coremod/DreamClassTransformer.java +++ b/src/main/java/com/dreammaster/coremod/DreamClassTransformer.java @@ -13,7 +13,6 @@ import com.dreammaster.coremod.transformers.recipenukers.AdvancedSolarPanelTransformer; import com.dreammaster.coremod.transformers.recipenukers.BibliocraftTransformer; import com.dreammaster.coremod.transformers.recipenukers.GraviSuiteTransformer; -import com.dreammaster.coremod.transformers.recipenukers.TravellersGearTransformer; public class DreamClassTransformer implements IClassTransformer { @@ -27,7 +26,6 @@ public DreamClassTransformer() { registerTransformer(new BibliocraftTransformer()); registerTransformer(new GraviSuiteTransformer()); registerTransformer(new ItemFocusWardingTransformer()); - registerTransformer(new TravellersGearTransformer()); } private void registerTransformer(IDreamTransformer transformer) { diff --git a/src/main/java/com/dreammaster/coremod/transformers/recipenukers/TravellersGearTransformer.java b/src/main/java/com/dreammaster/coremod/transformers/recipenukers/TravellersGearTransformer.java deleted file mode 100644 index 0925f8850a..0000000000 --- a/src/main/java/com/dreammaster/coremod/transformers/recipenukers/TravellersGearTransformer.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.dreammaster.coremod.transformers.recipenukers; - -import java.util.ListIterator; - -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodNode; - -import com.dreammaster.coremod.DreamCoreMod; -import com.dreammaster.coremod.IDreamTransformer; - -public class TravellersGearTransformer implements IDreamTransformer { - - @Override - public String[] targetedClasses() { - return new String[] { "travellersgear.TravellersGear" }; - } - - @Override - public void transform(ClassNode classNode) { - for (MethodNode methodNode : classNode.methods) { - if (checkMethodNode(methodNode, "init", "(Lcpw/mods/fml/common/event/FMLInitializationEvent;)V")) { - /* - * // spotless:off - * This deletes all the instructions from : - * [EXCLUDED] ChestGenHooks.getInfo("strongholdLibrary").addItem(new WeightedRandomChestContent(new ItemStack(simpleGear, 1, 6), 1, 1, 8)); - * To : - * [EXCLUDED] OreDictionary.registerOre("baubleRingGold", new ItemStack(simpleGear, 1, 2)); - */// spotless:on - int addItemCallsCount = 0; - final ListIterator iterator = methodNode.instructions.iterator(); - while (iterator.hasNext()) { - final AbstractInsnNode insnNode = iterator.next(); - if (checkMethodInsnNode( - insnNode, - Opcodes.INVOKEVIRTUAL, - "net/minecraftforge/common/ChestGenHooks", - "addItem", - "(Lnet/minecraft/util/WeightedRandomChestContent;)V")) { - addItemCallsCount++; - } else if (checkLdcInsnNode(insnNode, "baubleRingGold")) { - DreamCoreMod.logger.info( - "Taking a sledgehammer to {}.{}{}", - classNode.name, - methodNode.name, - methodNode.desc); - return; - } else if (addItemCallsCount == 5) { - iterator.remove(); - } - } - } - } - } - -} diff --git a/src/main/java/com/dreammaster/scripts/ScriptLoader.java b/src/main/java/com/dreammaster/scripts/ScriptLoader.java index 8901b54c82..f3c8940019 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptLoader.java +++ b/src/main/java/com/dreammaster/scripts/ScriptLoader.java @@ -113,7 +113,6 @@ public static void run() { new ScriptTinkersConstruct(), new ScriptTinkersDefence(), new ScriptTranslocator(), - new ScriptTravellersGear(), new ScriptTwilightForest(), new ScriptWarpTheory(), new ScriptWirelessRedstone(), diff --git a/src/main/java/com/dreammaster/scripts/ScriptTravellersGear.java b/src/main/java/com/dreammaster/scripts/ScriptTravellersGear.java deleted file mode 100644 index dea348d973..0000000000 --- a/src/main/java/com/dreammaster/scripts/ScriptTravellersGear.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.dreammaster.scripts; - -import static gregtech.api.enums.Mods.BiblioCraft; -import static gregtech.api.enums.Mods.PamsHarvestCraft; -import static gregtech.api.enums.Mods.TravellersGear; - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -import cpw.mods.fml.common.registry.GameRegistry; - -public class ScriptTravellersGear implements IScriptLoader { - - @Override - public String getScriptName() { - return "TravellersGear"; - } - - @Override - public List getDependencies() { - return Arrays.asList(TravellersGear.ID, BiblioCraft.ID, PamsHarvestCraft.ID); - } - - @Override - public void loadRecipes() { - final Item simpleGear = GameRegistry.findItem(TravellersGear.ID, "simpleGear"); - final Block armorStand = GameRegistry.findBlock(TravellersGear.ID, "armorstand"); - final Item hardenedLeatherItem = GameRegistry.findItem(PamsHarvestCraft.ID, "hardenedleatherItem"); - final Item biblioArmorStandItem = GameRegistry.findItem(BiblioCraft.ID, "Armor Stand"); - int[] dyeColours = { 0xffffff, 0xD87F33, 0xB24CD8, 0x6699D8, 0xE5E533, 0x7FCC19, 0xF27FA5, 0x4C4C4C, 0x999999, - 0x4C7F99, 0x7F3FB2, 0x334CB2, 0x664C33, 0x667F33, 0x993333, 0x191919 }; - for (int d = 0; d < dyeColours.length; d++) { - GameRegistry.addRecipe( - new ShapelessOreRecipe( - getColouredItem(new ItemStack(simpleGear, 1, 0), dyeColours[d]), - new ItemStack(simpleGear, 1, 0), - new ItemStack(Items.dye, 1, (15 - d)))); - } - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(simpleGear, 1, 0), - "RSR", - "WWW", - "WWW", - 'R', - "ringIron", - 'S', - Items.string, - 'W', - new ItemStack(GameRegistry.findItem(PamsHarvestCraft.ID, "wovencottonItem")))); - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(simpleGear, 1, 4), - "ll ", - "ill", - " i ", - 'i', - "screwIron", - 'l', - new ItemStack(hardenedLeatherItem))); - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(simpleGear, 1, 5), - " l ", - "lil", - " l ", - 'i', - "screwIron", - 'l', - new ItemStack(hardenedLeatherItem))); - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(simpleGear, 1, 6), - " l ", - "pbp", - " l ", - 'b', - Items.enchanted_book, - 'p', - Items.paper, - 'l', - "gemEmerald")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(armorStand), new ItemStack(biblioArmorStandItem))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(biblioArmorStandItem), new ItemStack(armorStand))); - } - - private ItemStack getColouredItem(ItemStack item, int col) { - if (!item.hasTagCompound()) { - item.setTagCompound(new NBTTagCompound()); - } - NBTTagCompound tag = item.getTagCompound().getCompoundTag("display"); - tag.setInteger("colour", col); - item.getTagCompound().setTag("display", tag); - return item; - } - -} From 210c0130eb04a52623293188822255412a992c04 Mon Sep 17 00:00:00 2001 From: Ethryan <3237986+Ethryan@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:16:42 +0100 Subject: [PATCH 2/2] fix spelling error --- src/main/resources/assets/dreamcraft/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/dreamcraft/lang/en_US.lang b/src/main/resources/assets/dreamcraft/lang/en_US.lang index 23eda1af32..7c2bf6fa89 100644 --- a/src/main/resources/assets/dreamcraft/lang/en_US.lang +++ b/src/main/resources/assets/dreamcraft/lang/en_US.lang @@ -1402,7 +1402,7 @@ tc.research_text.TalismanfoodtGTNH=Everfull belly tc.research_page.TalismanfoodtGTNH=You often find yourself needing to take breaks during marathon researching sessions to satisfy your hunger. Finally you have found a way to get past your need for food.

By infusing a diamond with the essence of hunger, you have created an item that is able to suck the nourishing energy from various food items in your hotbar and store this energy within. It will then automatically replenish your food meter if it is depleted.

This device will only work on simple food items, so foods that invoke effects such as Rotten Flesh and Golden Apples must be consumed normally. tc.research_name.DreamcatcherGTNH=Wispy Dreamcatcher tc.research_text.DreamcatcherGTNH=Filtered thoughts -tc.research_name.CrucsoulGTNH=Crucible of Soulst +tc.research_name.CrucsoulGTNH=Crucible of Souls tc.research_text.CrucsoulGTNH=Caution: Keep out of reach of children. tc.research_name.ROD_TRANSMUTATION=Transmutative Wand Core tc.research_text.ROD_TRANSMUTATION=One thing into another