Improvements

This commit is contained in:
Connor Colenso committed 2023-10-21 21:25:10 +01:00
1 parent ccb06943df
commit dce4f6eada
4 files changed
+21 -13

No files matched your search

@@ -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<Item> getItem() {
return item.delegate;
public Item getItem() {
return item;
}
}
@@ -1,4 +1,4 @@
package com.myname.mymodid;
package com.myname.mymodid.API;
import net.minecraft.item.Item;
@@ -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;
@@ -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<Item> delegate;
@Shadow
private int itemDamage; // Metadata
@Inject(method = "<init>(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();
}
}