From 63628854e612aa1fd97e0b95263b2fa7fd4c6829 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Sat, 21 Oct 2023 20:59:19 +0200 Subject: [PATCH 1/8] setup mixins --- gradle.properties | 8 +-- src/main/java/com/myname/mymodid/MyMod.java | 10 +--- .../myname/mymodid/PosteaLoadingPlugin.java | 57 ------------------- .../mymodid/mixins/PosteaLoadingPlugin.java | 54 ++++++++++++++++++ .../{ => mixins/early}/MixinItemStack.java | 4 +- src/main/resources/mixins.json | 7 --- src/main/resources/mixins.mymodid.early.json | 11 ++++ src/main/resources/mixins.mymodid.json | 10 ++++ 8 files changed, 83 insertions(+), 78 deletions(-) delete mode 100644 src/main/java/com/myname/mymodid/PosteaLoadingPlugin.java create mode 100644 src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java rename src/main/java/com/myname/mymodid/{ => mixins/early}/MixinItemStack.java (91%) delete mode 100644 src/main/resources/mixins.json create mode 100644 src/main/resources/mixins.mymodid.early.json create mode 100644 src/main/resources/mixins.mymodid.json diff --git a/gradle.properties b/gradle.properties index 39dbfda..5e6d911 100644 --- a/gradle.properties +++ b/gradle.properties @@ -61,17 +61,17 @@ apiPackage = accessTransformersFile = # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! -usesMixins = false +usesMixins = true # Adds some debug arguments like verbose output and export -usesMixinDebug = false +usesMixinDebug = true # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! -mixinsPackage = +mixinsPackage = mixins # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! # This parameter is for legacy compatibility only # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin -coreModClass = +coreModClass = mixins.PosteaLoadingPlugin # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! containsMixinsAndOrCoreModOnly = false diff --git a/src/main/java/com/myname/mymodid/MyMod.java b/src/main/java/com/myname/mymodid/MyMod.java index 8dc124f..9076847 100644 --- a/src/main/java/com/myname/mymodid/MyMod.java +++ b/src/main/java/com/myname/mymodid/MyMod.java @@ -1,16 +1,13 @@ package com.myname.mymodid; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; -import org.spongepowered.asm.launch.MixinBootstrap; -import org.spongepowered.asm.mixin.Mixins; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; @Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, acceptedMinecraftVersions = "[1.7.10]") public class MyMod { @@ -22,9 +19,6 @@ public class MyMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - MixinBootstrap.init(); - Mixins.addConfiguration("mixins.json"); - proxy.preInit(event); } diff --git a/src/main/java/com/myname/mymodid/PosteaLoadingPlugin.java b/src/main/java/com/myname/mymodid/PosteaLoadingPlugin.java deleted file mode 100644 index d060ab9..0000000 --- a/src/main/java/com/myname/mymodid/PosteaLoadingPlugin.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.myname.mymodid; - -import com.falsepattern.gasstation.IEarlyMixinLoader; -import cpw.mods.fml.relauncher.FMLLaunchHandler; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; -import jdk.jfr.Name; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -@IFMLLoadingPlugin.TransformerExclusions({ "mods.mymod" }) -@Name("mymod") -@IFMLLoadingPlugin.SortingIndex(1500) -@IFMLLoadingPlugin.MCVersion("1.7.10") -public final class PosteaLoadingPlugin implements IEarlyMixinLoader, IFMLLoadingPlugin { - - public static final String ItemStackTransformer = "mods.battlegear2.coremod.transformers.EntityPlayerTransformer"; - - public static File debugOutputLocation; - public static final String[] transformers = new String[] { ItemStackTransformer }; - - @Override - public String[] getASMTransformerClass() { - return transformers; - } - - @Override - public String getAccessTransformerClass() { - return null; - } - - @Override - public String getModContainerClass() { - return null; - } - - @Override - public String getSetupClass() { - return null; - } - - @Override - public void injectData(Map data) { - debugOutputLocation = new File(data.get("mcLocation").toString(), "ItemStack edited classes"); - } - - @Override - public List getMixinConfigs() { - List list = new ArrayList<>(); - list.add("mixins.json" ); - return list; - } - -} diff --git a/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java b/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java new file mode 100644 index 0000000..86badf9 --- /dev/null +++ b/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java @@ -0,0 +1,54 @@ +package com.myname.mymodid.mixins; + +import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; +import cpw.mods.fml.relauncher.FMLLaunchHandler; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@IFMLLoadingPlugin.MCVersion("1.7.10") +public final class PosteaLoadingPlugin implements IEarlyMixinLoader, IFMLLoadingPlugin { + + @Override + public String[] getASMTransformerClass() { + return null; + } + + @Override + public String getAccessTransformerClass() { + return null; + } + + @Override + public String getModContainerClass() { + return null; + } + + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(Map data) {} + + @Override + public String getMixinConfig() { + return "mixins.mymodid.early.json"; + } + + @Override + public List getMixins(Set loadedCoreMods) { + final List mixins = new ArrayList<>(); + mixins.add("MixinItemStack"); + if (FMLLaunchHandler.side().isClient()) { + // register client only mixins here, + // that is mixins that target client classes + // such as net.minecraft.client.Minecraft class + } + return mixins; + } +} diff --git a/src/main/java/com/myname/mymodid/MixinItemStack.java b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java similarity index 91% rename from src/main/java/com/myname/mymodid/MixinItemStack.java rename to src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java index 57bf59d..076b906 100644 --- a/src/main/java/com/myname/mymodid/MixinItemStack.java +++ b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java @@ -1,4 +1,4 @@ -package com.myname.mymodid; +package com.myname.mymodid.mixins.early; import net.minecraft.item.Item; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ItemStack.class) public abstract class MixinItemStack{ - @Inject(method = "(Lnet/minecraft/item/Item;II)V", at = @At("HEAD")) + @Inject(method = "(Lnet/minecraft/item/Item;II)V", at = @At("RETURN")) private void onConstructorHead(Item item, int stackSize, int metadata, CallbackInfo ci) { System.out.println(item.getUnlocalizedName() + " " + metadata + " " + stackSize); } diff --git a/src/main/resources/mixins.json b/src/main/resources/mixins.json deleted file mode 100644 index 1dc7a14..0000000 --- a/src/main/resources/mixins.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "required": true, - "package": "com.myname.mymodid", - "mixins": [ - "MixinItemStack" - ] -} diff --git a/src/main/resources/mixins.mymodid.early.json b/src/main/resources/mixins.mymodid.early.json new file mode 100644 index 0000000..6c329b2 --- /dev/null +++ b/src/main/resources/mixins.mymodid.early.json @@ -0,0 +1,11 @@ +{ + "required": true, + "minVersion": "0.8.5-GTNH", + "package": "com.myname.mymodid.mixins.early", + "refmap": "mixins.mymodid.refmap.json", + "target": "@env(DEFAULT)", + "compatibilityLevel": "JAVA_8", + "mixins": [], + "client": [], + "server": [] +} diff --git a/src/main/resources/mixins.mymodid.json b/src/main/resources/mixins.mymodid.json new file mode 100644 index 0000000..c27a12d --- /dev/null +++ b/src/main/resources/mixins.mymodid.json @@ -0,0 +1,10 @@ +{ + "required": true, + "minVersion": "0.8.5-GTNH", + "refmap": "mixins.mymodid.refmap.json", + "target": "@env(DEFAULT)", + "compatibilityLevel": "JAVA_8", + "mixins": [], + "client": [], + "server": [] +} From ccb06943dfedf501f28345d6cf2afbfc8991186b Mon Sep 17 00:00:00 2001 From: Connor Colenso Date: Sat, 21 Oct 2023 20:49:33 +0100 Subject: [PATCH 2/8] Works! --- .../java/com/myname/mymodid/ItemStackKey.java | 31 +++++++++---------- src/main/java/com/myname/mymodid/MyMod.java | 2 ++ .../myname/mymodid/ReplacementManager.java | 13 ++++---- .../mymodid/mixins/early/MixinItemStack.java | 19 ++++++++++-- 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/myname/mymodid/ItemStackKey.java b/src/main/java/com/myname/mymodid/ItemStackKey.java index 3454c26..cd82ce6 100644 --- a/src/main/java/com/myname/mymodid/ItemStackKey.java +++ b/src/main/java/com/myname/mymodid/ItemStackKey.java @@ -2,40 +2,39 @@ package com.myname.mymodid; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.RegistryDelegate; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import java.util.Objects; public class ItemStackKey { - private final String modId; - private final String itemName; + private final Item item; private final int meta; - public ItemStackKey(String modId, String itemName, int meta) { - this.modId = modId; - this.itemName = itemName; + public ItemStackKey(Item item, int meta) { + this.item = item; this.meta = meta; } - public ItemStackKey(ItemStack stack) { - this(stack.getItem().getUnlocalizedName().substring(4), - GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId, - stack.getItemDamage()); - } - @Override public boolean equals(Object o) { - if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; ItemStackKey that = (ItemStackKey) o; - return meta == that.meta && - Objects.equals(modId, that.modId) && - Objects.equals(itemName, that.itemName); + return (this.meta == that.meta) && Objects.equals(this.item, that.item); } @Override public int hashCode() { - return Objects.hash(modId, itemName, meta); + return Objects.hash(item, meta); + } + + public int getDamage() { + return meta; + } + + public RegistryDelegate getItem() { + return item.delegate; } } diff --git a/src/main/java/com/myname/mymodid/MyMod.java b/src/main/java/com/myname/mymodid/MyMod.java index 9076847..73f84bc 100644 --- a/src/main/java/com/myname/mymodid/MyMod.java +++ b/src/main/java/com/myname/mymodid/MyMod.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; +import net.minecraft.init.Items; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -19,6 +20,7 @@ public class MyMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { + ReplacementManager.addReplacement(Items.apple, 0, Items.bow, 10); proxy.preInit(event); } diff --git a/src/main/java/com/myname/mymodid/ReplacementManager.java b/src/main/java/com/myname/mymodid/ReplacementManager.java index 504523f..d8ed2e1 100644 --- a/src/main/java/com/myname/mymodid/ReplacementManager.java +++ b/src/main/java/com/myname/mymodid/ReplacementManager.java @@ -1,20 +1,21 @@ package com.myname.mymodid; -import net.minecraft.item.ItemStack; +import net.minecraft.item.Item; import java.util.HashMap; import java.util.Map; public class ReplacementManager { - private static final Map replacementMap = new HashMap<>(); + private static final Map replacementMap = new HashMap<>(); - public static void addReplacement(String modId, String itemName, int meta, ItemStack replacement) { - replacementMap.put(new ItemStackKey(modId, itemName, meta), replacement); + public static void addReplacement(Item itemIn, int metaIn, Item itemOut, int metaOut) { + replacementMap.put(new ItemStackKey(itemIn, metaIn), new ItemStackKey(itemOut, metaOut)); } - public static ItemStack getReplacement(ItemStack original) { - return replacementMap.getOrDefault(new ItemStackKey(original), original); + public static ItemStackKey getReplacement(Item itemIn, int metaIn) { + ItemStackKey stackKey = new ItemStackKey(itemIn, metaIn); + return replacementMap.getOrDefault(stackKey, stackKey); } } diff --git a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java index 076b906..34a0208 100644 --- a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java +++ b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java @@ -1,19 +1,32 @@ package com.myname.mymodid.mixins.early; +import com.myname.mymodid.ItemStackKey; +import com.myname.mymodid.ReplacementManager; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ItemStack.class) -public abstract class MixinItemStack{ +public abstract class MixinItemStack { + + @Shadow + private cpw.mods.fml.common.registry.RegistryDelegate delegate; + @Shadow + private int itemDamage; // Metadata @Inject(method = "(Lnet/minecraft/item/Item;II)V", at = @At("RETURN")) - private void onConstructorHead(Item item, int stackSize, int metadata, CallbackInfo ci) { - System.out.println(item.getUnlocalizedName() + " " + metadata + " " + stackSize); + private void onConstructorHead(Item item, int size, int metadata, CallbackInfo ci) { + ItemStackKey replacement = ReplacementManager.getReplacement(item, metadata); + + // Edit private variables here. + itemDamage = replacement.getDamage(); + delegate = replacement.getItem(); } } From dce4f6eada6558b7944735617a2f178b06c01be2 Mon Sep 17 00:00:00 2001 From: Connor Colenso Date: Sat, 21 Oct 2023 21:25:10 +0100 Subject: [PATCH 3/8] Improvements --- .../mymodid/{ => API}/ItemStackKey.java | 8 +++---- .../mymodid/{ => API}/ReplacementManager.java | 2 +- src/main/java/com/myname/mymodid/MyMod.java | 1 + .../mymodid/mixins/early/MixinItemStack.java | 23 +++++++++++++------ 4 files changed, 21 insertions(+), 13 deletions(-) rename src/main/java/com/myname/mymodid/{ => API}/ItemStackKey.java (78%) rename src/main/java/com/myname/mymodid/{ => API}/ReplacementManager.java (95%) diff --git a/src/main/java/com/myname/mymodid/ItemStackKey.java b/src/main/java/com/myname/mymodid/API/ItemStackKey.java similarity index 78% rename from src/main/java/com/myname/mymodid/ItemStackKey.java rename to src/main/java/com/myname/mymodid/API/ItemStackKey.java index cd82ce6..91fc66e 100644 --- a/src/main/java/com/myname/mymodid/ItemStackKey.java +++ b/src/main/java/com/myname/mymodid/API/ItemStackKey.java @@ -1,10 +1,8 @@ -package com.myname.mymodid; +package com.myname.mymodid.API; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.RegistryDelegate; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import java.util.Objects; @@ -33,8 +31,8 @@ public class ItemStackKey { return meta; } - public RegistryDelegate getItem() { - return item.delegate; + public Item getItem() { + return item; } } diff --git a/src/main/java/com/myname/mymodid/ReplacementManager.java b/src/main/java/com/myname/mymodid/API/ReplacementManager.java similarity index 95% rename from src/main/java/com/myname/mymodid/ReplacementManager.java rename to src/main/java/com/myname/mymodid/API/ReplacementManager.java index d8ed2e1..f10cb5c 100644 --- a/src/main/java/com/myname/mymodid/ReplacementManager.java +++ b/src/main/java/com/myname/mymodid/API/ReplacementManager.java @@ -1,4 +1,4 @@ -package com.myname.mymodid; +package com.myname.mymodid.API; import net.minecraft.item.Item; diff --git a/src/main/java/com/myname/mymodid/MyMod.java b/src/main/java/com/myname/mymodid/MyMod.java index 73f84bc..faa0499 100644 --- a/src/main/java/com/myname/mymodid/MyMod.java +++ b/src/main/java/com/myname/mymodid/MyMod.java @@ -1,5 +1,6 @@ package com.myname.mymodid; +import com.myname.mymodid.API.ReplacementManager; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; diff --git a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java index 34a0208..8fad805 100644 --- a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java +++ b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java @@ -1,11 +1,11 @@ package com.myname.mymodid.mixins.early; -import com.myname.mymodid.ItemStackKey; -import com.myname.mymodid.ReplacementManager; -import net.minecraft.init.Items; +import com.myname.mymodid.API.ItemStackKey; +import com.myname.mymodid.API.ReplacementManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -15,18 +15,27 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ItemStack.class) public abstract class MixinItemStack { - @Shadow - private cpw.mods.fml.common.registry.RegistryDelegate delegate; @Shadow private int itemDamage; // Metadata @Inject(method = "(Lnet/minecraft/item/Item;II)V", at = @At("RETURN")) - private void onConstructorHead(Item item, int size, int metadata, CallbackInfo ci) { + private void onConstructorReturn(Item item, int size, int metadata, CallbackInfo ci) { ItemStackKey replacement = ReplacementManager.getReplacement(item, metadata); // Edit private variables here. itemDamage = replacement.getDamage(); - delegate = replacement.getItem(); + field_151002_e = replacement.getItem(); + } + + + @Shadow + private Item field_151002_e; + @Inject(method = "readFromNBT(Lnet/minecraft/nbt/NBTTagCompound;)V", at = @At("RETURN")) + private void onReadFromNBTReturn(NBTTagCompound p_77963_1_, CallbackInfo ci) { + ItemStackKey replacement = ReplacementManager.getReplacement(field_151002_e, itemDamage); + + field_151002_e = replacement.getItem(); + itemDamage = replacement.getDamage(); } } From 656b839f6a4484f17ce430198bb4f51ebe320ea9 Mon Sep 17 00:00:00 2001 From: Connor Colenso Date: Sat, 21 Oct 2023 21:35:48 +0100 Subject: [PATCH 4/8] Improvements --- dependencies.gradle | 1 + .../java/com/myname/mymodid/API/ItemStackKey.java | 7 ++++--- src/main/java/com/myname/mymodid/MyMod.java | 2 +- .../myname/mymodid/mixins/early/MixinItemStack.java | 12 +++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 83bb0ca..3ebc8cc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,4 +35,5 @@ */ dependencies { api('com.github.GTNewHorizons:SpongePoweredMixin:0.8.5-GTNH-2:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.30:dev') } diff --git a/src/main/java/com/myname/mymodid/API/ItemStackKey.java b/src/main/java/com/myname/mymodid/API/ItemStackKey.java index 91fc66e..429e409 100644 --- a/src/main/java/com/myname/mymodid/API/ItemStackKey.java +++ b/src/main/java/com/myname/mymodid/API/ItemStackKey.java @@ -17,9 +17,10 @@ public class ItemStackKey { @Override public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; - ItemStackKey that = (ItemStackKey) o; - return (this.meta == that.meta) && Objects.equals(this.item, that.item); + if (o == null) return false; + if (o instanceof ItemStackKey that) { + return (this.meta == that.meta) && (this.item == that.item); + } else return false; } @Override diff --git a/src/main/java/com/myname/mymodid/MyMod.java b/src/main/java/com/myname/mymodid/MyMod.java index faa0499..58d32a0 100644 --- a/src/main/java/com/myname/mymodid/MyMod.java +++ b/src/main/java/com/myname/mymodid/MyMod.java @@ -21,7 +21,7 @@ public class MyMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - ReplacementManager.addReplacement(Items.apple, 0, Items.bow, 10); + ReplacementManager.addReplacement(Items.iron_ingot, 0, Items.bow, 10); proxy.preInit(event); } diff --git a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java index 8fad805..a8065ed 100644 --- a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java +++ b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java @@ -17,6 +17,8 @@ public abstract class MixinItemStack { @Shadow private int itemDamage; // Metadata + @Shadow + private cpw.mods.fml.common.registry.RegistryDelegate delegate; @Inject(method = "(Lnet/minecraft/item/Item;II)V", at = @At("RETURN")) private void onConstructorReturn(Item item, int size, int metadata, CallbackInfo ci) { @@ -24,17 +26,17 @@ public abstract class MixinItemStack { // Edit private variables here. itemDamage = replacement.getDamage(); - field_151002_e = replacement.getItem(); + delegate = replacement.getItem().delegate; } - @Shadow - private Item field_151002_e; +/* @Shadow + private Item field_151002_e;*/ @Inject(method = "readFromNBT(Lnet/minecraft/nbt/NBTTagCompound;)V", at = @At("RETURN")) private void onReadFromNBTReturn(NBTTagCompound p_77963_1_, CallbackInfo ci) { - ItemStackKey replacement = ReplacementManager.getReplacement(field_151002_e, itemDamage); + ItemStackKey replacement = ReplacementManager.getReplacement(delegate.get(), itemDamage); - field_151002_e = replacement.getItem(); + delegate = replacement.getItem().delegate; itemDamage = replacement.getDamage(); } From 3b23776ec3b73dcbb5db4c50e98c9ea42207d4eb Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sat, 21 Oct 2023 22:55:40 +0100 Subject: [PATCH 5/8] Working with NBT --- .../myname/mymodid/API/ReplacementManager.java | 3 +-- .../mymodid/mixins/early/MixinItemStack.java | 18 +++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/myname/mymodid/API/ReplacementManager.java b/src/main/java/com/myname/mymodid/API/ReplacementManager.java index f10cb5c..342fc90 100644 --- a/src/main/java/com/myname/mymodid/API/ReplacementManager.java +++ b/src/main/java/com/myname/mymodid/API/ReplacementManager.java @@ -14,8 +14,7 @@ public class ReplacementManager { } public static ItemStackKey getReplacement(Item itemIn, int metaIn) { - ItemStackKey stackKey = new ItemStackKey(itemIn, metaIn); - return replacementMap.getOrDefault(stackKey, stackKey); + return replacementMap.getOrDefault(new ItemStackKey(itemIn, metaIn), null); } } diff --git a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java index a8065ed..b7a432e 100644 --- a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java +++ b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -18,26 +19,29 @@ public abstract class MixinItemStack { @Shadow private int itemDamage; // Metadata @Shadow - private cpw.mods.fml.common.registry.RegistryDelegate delegate; + private Item field_151002_e; @Inject(method = "(Lnet/minecraft/item/Item;II)V", at = @At("RETURN")) private void onConstructorReturn(Item item, int size, int metadata, CallbackInfo ci) { ItemStackKey replacement = ReplacementManager.getReplacement(item, metadata); + if (replacement == null) return; + // Edit private variables here. itemDamage = replacement.getDamage(); - delegate = replacement.getItem().delegate; + func_150996_a(replacement.getItem()); } - -/* @Shadow - private Item field_151002_e;*/ @Inject(method = "readFromNBT(Lnet/minecraft/nbt/NBTTagCompound;)V", at = @At("RETURN")) private void onReadFromNBTReturn(NBTTagCompound p_77963_1_, CallbackInfo ci) { - ItemStackKey replacement = ReplacementManager.getReplacement(delegate.get(), itemDamage); + ItemStackKey replacement = ReplacementManager.getReplacement(field_151002_e, itemDamage); - delegate = replacement.getItem().delegate; + if (replacement == null) return; + + func_150996_a(replacement.getItem()); itemDamage = replacement.getDamage(); } + @Unique + public native void func_150996_a(Item p_150996_1_); } From 111d7891d6597666dcf5b48b1579c68930f88b5b Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sat, 21 Oct 2023 23:10:28 +0100 Subject: [PATCH 6/8] Working --- .../mymodid/API/ReplacementManager.java | 4 ++ .../java/com/myname/mymodid/ClientProxy.java | 8 ---- .../java/com/myname/mymodid/CommonProxy.java | 27 ----------- src/main/java/com/myname/mymodid/Config.java | 20 -------- src/main/java/com/myname/mymodid/MyMod.java | 46 ------------------- src/main/java/com/myname/mymodid/Postea.java | 10 ++++ .../mymodid/mixins/PosteaLoadingPlugin.java | 7 +-- 7 files changed, 15 insertions(+), 107 deletions(-) delete mode 100644 src/main/java/com/myname/mymodid/ClientProxy.java delete mode 100644 src/main/java/com/myname/mymodid/CommonProxy.java delete mode 100644 src/main/java/com/myname/mymodid/Config.java delete mode 100644 src/main/java/com/myname/mymodid/MyMod.java create mode 100644 src/main/java/com/myname/mymodid/Postea.java diff --git a/src/main/java/com/myname/mymodid/API/ReplacementManager.java b/src/main/java/com/myname/mymodid/API/ReplacementManager.java index 342fc90..aef7d47 100644 --- a/src/main/java/com/myname/mymodid/API/ReplacementManager.java +++ b/src/main/java/com/myname/mymodid/API/ReplacementManager.java @@ -9,10 +9,14 @@ import java.util.Map; public class ReplacementManager { private static final Map replacementMap = new HashMap<>(); + // Public API for adding replacements. + + @SuppressWarnings("unused") public static void addReplacement(Item itemIn, int metaIn, Item itemOut, int metaOut) { replacementMap.put(new ItemStackKey(itemIn, metaIn), new ItemStackKey(itemOut, metaOut)); } + @SuppressWarnings("unused") public static ItemStackKey getReplacement(Item itemIn, int metaIn) { return replacementMap.getOrDefault(new ItemStackKey(itemIn, metaIn), null); } diff --git a/src/main/java/com/myname/mymodid/ClientProxy.java b/src/main/java/com/myname/mymodid/ClientProxy.java deleted file mode 100644 index ea70aa1..0000000 --- a/src/main/java/com/myname/mymodid/ClientProxy.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.myname.mymodid; - -public class ClientProxy extends CommonProxy { - - // Override CommonProxy methods here, if you want a different behaviour on the client (e.g. registering renders). - // Don't forget to call the super methods as well. - -} diff --git a/src/main/java/com/myname/mymodid/CommonProxy.java b/src/main/java/com/myname/mymodid/CommonProxy.java deleted file mode 100644 index d5df802..0000000 --- a/src/main/java/com/myname/mymodid/CommonProxy.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.myname.mymodid; - -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; - -public class CommonProxy { - - // preInit "Run before anything else. Read your config, create blocks, items, etc, and register them with the - // GameRegistry." (Remove if not needed) - public void preInit(FMLPreInitializationEvent event) { - Config.synchronizeConfiguration(event.getSuggestedConfigurationFile()); - - MyMod.LOG.info(Config.greeting); - MyMod.LOG.info("I am " + Tags.MODNAME + " at version " + Tags.VERSION); - } - - // load "Do your mod setup. Build whatever data structures you care about. Register recipes." (Remove if not needed) - public void init(FMLInitializationEvent event) {} - - // postInit "Handle interaction with other mods, complete your setup based on this." (Remove if not needed) - public void postInit(FMLPostInitializationEvent event) {} - - // register server commands in this event handler (Remove if not needed) - public void serverStarting(FMLServerStartingEvent event) {} -} diff --git a/src/main/java/com/myname/mymodid/Config.java b/src/main/java/com/myname/mymodid/Config.java deleted file mode 100644 index b1c4f50..0000000 --- a/src/main/java/com/myname/mymodid/Config.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.myname.mymodid; - -import java.io.File; - -import net.minecraftforge.common.config.Configuration; - -public class Config { - - public static String greeting = "Hello World"; - - public static void synchronizeConfiguration(File configFile) { - Configuration configuration = new Configuration(configFile); - - greeting = configuration.getString("greeting", Configuration.CATEGORY_GENERAL, greeting, "How shall I greet?"); - - if (configuration.hasChanged()) { - configuration.save(); - } - } -} diff --git a/src/main/java/com/myname/mymodid/MyMod.java b/src/main/java/com/myname/mymodid/MyMod.java deleted file mode 100644 index 58d32a0..0000000 --- a/src/main/java/com/myname/mymodid/MyMod.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.myname.mymodid; - -import com.myname.mymodid.API.ReplacementManager; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import net.minecraft.init.Items; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, acceptedMinecraftVersions = "[1.7.10]") -public class MyMod { - - public static final Logger LOG = LogManager.getLogger(Tags.MODID); - - @SidedProxy(clientSide = "com.myname.mymodid.ClientProxy", serverSide = "com.myname.mymodid.CommonProxy") - public static CommonProxy proxy; - - @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) { - ReplacementManager.addReplacement(Items.iron_ingot, 0, Items.bow, 10); - proxy.preInit(event); - } - - @Mod.EventHandler - // load "Do your mod setup. Build whatever data structures you care about. Register recipes." (Remove if not needed) - public void init(FMLInitializationEvent event) { - proxy.init(event); - } - - @Mod.EventHandler - // postInit "Handle interaction with other mods, complete your setup based on this." (Remove if not needed) - public void postInit(FMLPostInitializationEvent event) { - proxy.postInit(event); - } - - @Mod.EventHandler - // register server commands in this event handler (Remove if not needed) - public void serverStarting(FMLServerStartingEvent event) { - proxy.serverStarting(event); - } -} - diff --git a/src/main/java/com/myname/mymodid/Postea.java b/src/main/java/com/myname/mymodid/Postea.java new file mode 100644 index 0000000..e0992ea --- /dev/null +++ b/src/main/java/com/myname/mymodid/Postea.java @@ -0,0 +1,10 @@ +package com.myname.mymodid; + +import cpw.mods.fml.common.Mod; + +@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, acceptedMinecraftVersions = "[1.7.10]") +@SuppressWarnings("unused") +public class Postea { + +} + diff --git a/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java b/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java index 86badf9..c4d045a 100644 --- a/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java +++ b/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java @@ -1,7 +1,6 @@ package com.myname.mymodid.mixins; import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; -import cpw.mods.fml.relauncher.FMLLaunchHandler; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import java.util.ArrayList; @@ -44,11 +43,7 @@ public final class PosteaLoadingPlugin implements IEarlyMixinLoader, IFMLLoading public List getMixins(Set loadedCoreMods) { final List mixins = new ArrayList<>(); mixins.add("MixinItemStack"); - if (FMLLaunchHandler.side().isClient()) { - // register client only mixins here, - // that is mixins that target client classes - // such as net.minecraft.client.Minecraft class - } + return mixins; } } From fa3471ef670a9763ae2290fb1b2ebee9fd4cd8fe Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sat, 21 Oct 2023 23:12:20 +0100 Subject: [PATCH 7/8] Spotless --- src/main/java/com/myname/mymodid/API/ItemStackKey.java | 8 +++----- .../java/com/myname/mymodid/API/ReplacementManager.java | 7 +++---- src/main/java/com/myname/mymodid/Postea.java | 1 - .../com/myname/mymodid/mixins/PosteaLoadingPlugin.java | 7 ++++--- .../com/myname/mymodid/mixins/early/MixinItemStack.java | 7 ++++--- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/myname/mymodid/API/ItemStackKey.java b/src/main/java/com/myname/mymodid/API/ItemStackKey.java index 429e409..0266b42 100644 --- a/src/main/java/com/myname/mymodid/API/ItemStackKey.java +++ b/src/main/java/com/myname/mymodid/API/ItemStackKey.java @@ -1,12 +1,11 @@ package com.myname.mymodid.API; - -import cpw.mods.fml.common.registry.RegistryDelegate; -import net.minecraft.item.Item; - import java.util.Objects; +import net.minecraft.item.Item; + public class ItemStackKey { + private final Item item; private final int meta; @@ -36,4 +35,3 @@ public class ItemStackKey { return item; } } - diff --git a/src/main/java/com/myname/mymodid/API/ReplacementManager.java b/src/main/java/com/myname/mymodid/API/ReplacementManager.java index aef7d47..70dfe06 100644 --- a/src/main/java/com/myname/mymodid/API/ReplacementManager.java +++ b/src/main/java/com/myname/mymodid/API/ReplacementManager.java @@ -1,12 +1,12 @@ package com.myname.mymodid.API; - -import net.minecraft.item.Item; - import java.util.HashMap; import java.util.Map; +import net.minecraft.item.Item; + public class ReplacementManager { + private static final Map replacementMap = new HashMap<>(); // Public API for adding replacements. @@ -21,4 +21,3 @@ public class ReplacementManager { return replacementMap.getOrDefault(new ItemStackKey(itemIn, metaIn), null); } } - diff --git a/src/main/java/com/myname/mymodid/Postea.java b/src/main/java/com/myname/mymodid/Postea.java index e0992ea..e391bdb 100644 --- a/src/main/java/com/myname/mymodid/Postea.java +++ b/src/main/java/com/myname/mymodid/Postea.java @@ -7,4 +7,3 @@ import cpw.mods.fml.common.Mod; public class Postea { } - diff --git a/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java b/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java index c4d045a..364e24a 100644 --- a/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java +++ b/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java @@ -1,13 +1,14 @@ package com.myname.mymodid.mixins; -import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; - import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; +import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; + +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; + @IFMLLoadingPlugin.MCVersion("1.7.10") public final class PosteaLoadingPlugin implements IEarlyMixinLoader, IFMLLoadingPlugin { diff --git a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java index b7a432e..d4fd452 100644 --- a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java +++ b/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java @@ -1,11 +1,9 @@ package com.myname.mymodid.mixins.early; - -import com.myname.mymodid.API.ItemStackKey; -import com.myname.mymodid.API.ReplacementManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -13,6 +11,9 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.myname.mymodid.API.ItemStackKey; +import com.myname.mymodid.API.ReplacementManager; + @Mixin(ItemStack.class) public abstract class MixinItemStack { From ac466cc02a72d4cdc57bf2c1f1f90aa243289cc1 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sat, 21 Oct 2023 23:35:00 +0100 Subject: [PATCH 8/8] Spotless + some reworking and renaming --- dependencies.gradle | 2 +- gradle.properties | 8 ++++---- .../mymodid => colen/postea}/API/ItemStackKey.java | 2 +- .../mymodid => colen/postea}/API/ReplacementManager.java | 2 +- .../java/com/{myname/mymodid => colen/postea}/Postea.java | 2 +- .../postea}/mixins/PosteaLoadingPlugin.java | 4 ++-- .../postea}/mixins/early/MixinItemStack.java | 6 +++--- src/main/resources/mcmod.info | 4 ++-- ...mixins.mymodid.early.json => mixins.postea.early.json} | 8 +++++--- .../resources/{mixins.mymodid.json => mixins.postea.json} | 2 +- 10 files changed, 21 insertions(+), 19 deletions(-) rename src/main/java/com/{myname/mymodid => colen/postea}/API/ItemStackKey.java (95%) rename src/main/java/com/{myname/mymodid => colen/postea}/API/ReplacementManager.java (95%) rename src/main/java/com/{myname/mymodid => colen/postea}/Postea.java (87%) rename src/main/java/com/{myname/mymodid => colen/postea}/mixins/PosteaLoadingPlugin.java (92%) rename src/main/java/com/{myname/mymodid => colen/postea}/mixins/early/MixinItemStack.java (91%) rename src/main/resources/{mixins.mymodid.early.json => mixins.postea.early.json} (53%) rename src/main/resources/{mixins.mymodid.json => mixins.postea.json} (79%) diff --git a/dependencies.gradle b/dependencies.gradle index 3ebc8cc..fca978f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,5 +35,5 @@ */ dependencies { api('com.github.GTNewHorizons:SpongePoweredMixin:0.8.5-GTNH-2:dev') - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.30:dev') + //api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.30:dev') } diff --git a/gradle.properties b/gradle.properties index 5e6d911..a76e1f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -modName = MyMod +modName = Postea # This is a case-sensitive string to identify your mod. Convention is to use lower case. -modId = mymodid +modId = postea -modGroup = com.myname.mymodid +modGroup = com.colen.postea # WHY is there no version field? # The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the @@ -37,7 +37,7 @@ enableModernJavaSyntax = true enableGenericInjection = false # Generate a class with String fields for the mod id, name, version and group name named with the fields below -generateGradleTokenClass = com.myname.mymodid.Tags +generateGradleTokenClass = com.colen.postea.Tags gradleTokenModId = MODID gradleTokenModName = MODNAME gradleTokenVersion = VERSION diff --git a/src/main/java/com/myname/mymodid/API/ItemStackKey.java b/src/main/java/com/colen/postea/API/ItemStackKey.java similarity index 95% rename from src/main/java/com/myname/mymodid/API/ItemStackKey.java rename to src/main/java/com/colen/postea/API/ItemStackKey.java index 0266b42..3a0c2b5 100644 --- a/src/main/java/com/myname/mymodid/API/ItemStackKey.java +++ b/src/main/java/com/colen/postea/API/ItemStackKey.java @@ -1,4 +1,4 @@ -package com.myname.mymodid.API; +package com.colen.postea.API; import java.util.Objects; diff --git a/src/main/java/com/myname/mymodid/API/ReplacementManager.java b/src/main/java/com/colen/postea/API/ReplacementManager.java similarity index 95% rename from src/main/java/com/myname/mymodid/API/ReplacementManager.java rename to src/main/java/com/colen/postea/API/ReplacementManager.java index 70dfe06..22fde06 100644 --- a/src/main/java/com/myname/mymodid/API/ReplacementManager.java +++ b/src/main/java/com/colen/postea/API/ReplacementManager.java @@ -1,4 +1,4 @@ -package com.myname.mymodid.API; +package com.colen.postea.API; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/myname/mymodid/Postea.java b/src/main/java/com/colen/postea/Postea.java similarity index 87% rename from src/main/java/com/myname/mymodid/Postea.java rename to src/main/java/com/colen/postea/Postea.java index e391bdb..1312ed8 100644 --- a/src/main/java/com/myname/mymodid/Postea.java +++ b/src/main/java/com/colen/postea/Postea.java @@ -1,4 +1,4 @@ -package com.myname.mymodid; +package com.colen.postea; import cpw.mods.fml.common.Mod; diff --git a/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java b/src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java similarity index 92% rename from src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java rename to src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java index 364e24a..1c0d4ac 100644 --- a/src/main/java/com/myname/mymodid/mixins/PosteaLoadingPlugin.java +++ b/src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java @@ -1,4 +1,4 @@ -package com.myname.mymodid.mixins; +package com.colen.postea.mixins; import java.util.ArrayList; import java.util.List; @@ -37,7 +37,7 @@ public final class PosteaLoadingPlugin implements IEarlyMixinLoader, IFMLLoading @Override public String getMixinConfig() { - return "mixins.mymodid.early.json"; + return "mixins.postea.early.json"; } @Override diff --git a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java b/src/main/java/com/colen/postea/mixins/early/MixinItemStack.java similarity index 91% rename from src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java rename to src/main/java/com/colen/postea/mixins/early/MixinItemStack.java index d4fd452..d384a2b 100644 --- a/src/main/java/com/myname/mymodid/mixins/early/MixinItemStack.java +++ b/src/main/java/com/colen/postea/mixins/early/MixinItemStack.java @@ -1,4 +1,4 @@ -package com.myname.mymodid.mixins.early; +package com.colen.postea.mixins.early; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -11,8 +11,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.myname.mymodid.API.ItemStackKey; -import com.myname.mymodid.API.ReplacementManager; +import com.colen.postea.API.ItemStackKey; +import com.colen.postea.API.ReplacementManager; @Mixin(ItemStack.class) public abstract class MixinItemStack { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index e61cddf..f108bfd 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,12 +3,12 @@ "modList": [{ "modid": "${modId}", "name": "${modName}", - "description": "An example mod for Minecraft 1.7.10 with Forge focused on a stable setup.", + "description": "Utility mod for converting ItemStacks.", "version": "${modVersion}", "mcversion": "${minecraftVersion}", "url": "https://github.com/SinTh0r4s/MyMod", "updateUrl": "", - "authorList": ["SinTho0r4s"], + "authorList": ["Colen"], "credits": "", "logoFile": "", "screenshots": [], diff --git a/src/main/resources/mixins.mymodid.early.json b/src/main/resources/mixins.postea.early.json similarity index 53% rename from src/main/resources/mixins.mymodid.early.json rename to src/main/resources/mixins.postea.early.json index 6c329b2..9fe8afc 100644 --- a/src/main/resources/mixins.mymodid.early.json +++ b/src/main/resources/mixins.postea.early.json @@ -1,11 +1,13 @@ { "required": true, "minVersion": "0.8.5-GTNH", - "package": "com.myname.mymodid.mixins.early", - "refmap": "mixins.mymodid.refmap.json", + "package": "com.colen.postea.mixins.early", + "refmap": "mixins.postea.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8", - "mixins": [], + "mixins": [ + "MixinItemStack" + ], "client": [], "server": [] } diff --git a/src/main/resources/mixins.mymodid.json b/src/main/resources/mixins.postea.json similarity index 79% rename from src/main/resources/mixins.mymodid.json rename to src/main/resources/mixins.postea.json index c27a12d..3b643c4 100644 --- a/src/main/resources/mixins.mymodid.json +++ b/src/main/resources/mixins.postea.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8.5-GTNH", - "refmap": "mixins.mymodid.refmap.json", + "refmap": "mixins.postea.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8", "mixins": [],