Improvements

This commit is contained in:
Connor Colenso committed 2023-10-21 21:35:48 +01:00
1 parent dce4f6eada
commit 656b839f6a
4 files changed
+13 -9

No files matched your search

+1
View File
@@ -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')
}
@@ -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
+1 -1
View File
@@ -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);
}
@@ -17,6 +17,8 @@ public abstract class MixinItemStack {
@Shadow
private int itemDamage; // Metadata
@Shadow
private cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate;
@Inject(method = "<init>(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();
}