diff --git a/.gradle/9.4.0/checksums/checksums.lock b/.gradle/9.4.0/checksums/checksums.lock new file mode 100644 index 0000000..b70355d Binary files /dev/null and b/.gradle/9.4.0/checksums/checksums.lock differ diff --git a/.gradle/9.4.0/checksums/md5-checksums.bin b/.gradle/9.4.0/checksums/md5-checksums.bin new file mode 100644 index 0000000..bb2c448 Binary files /dev/null and b/.gradle/9.4.0/checksums/md5-checksums.bin differ diff --git a/.gradle/9.4.0/checksums/sha1-checksums.bin b/.gradle/9.4.0/checksums/sha1-checksums.bin new file mode 100644 index 0000000..5c72112 Binary files /dev/null and b/.gradle/9.4.0/checksums/sha1-checksums.bin differ diff --git a/.gradle/9.4.0/executionHistory/executionHistory.bin b/.gradle/9.4.0/executionHistory/executionHistory.bin new file mode 100644 index 0000000..04ba036 Binary files /dev/null and b/.gradle/9.4.0/executionHistory/executionHistory.bin differ diff --git a/.gradle/9.4.0/executionHistory/executionHistory.lock b/.gradle/9.4.0/executionHistory/executionHistory.lock new file mode 100644 index 0000000..77a9fe8 Binary files /dev/null and b/.gradle/9.4.0/executionHistory/executionHistory.lock differ diff --git a/.gradle/9.4.0/expanded/expanded.lock b/.gradle/9.4.0/expanded/expanded.lock new file mode 100644 index 0000000..fcd1125 Binary files /dev/null and b/.gradle/9.4.0/expanded/expanded.lock differ diff --git a/.gradle/9.4.0/fileChanges/last-build.bin b/.gradle/9.4.0/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/9.4.0/fileChanges/last-build.bin differ diff --git a/.gradle/9.4.0/fileHashes/fileHashes.bin b/.gradle/9.4.0/fileHashes/fileHashes.bin new file mode 100644 index 0000000..04fe035 Binary files /dev/null and b/.gradle/9.4.0/fileHashes/fileHashes.bin differ diff --git a/.gradle/9.4.0/fileHashes/fileHashes.lock b/.gradle/9.4.0/fileHashes/fileHashes.lock new file mode 100644 index 0000000..4bec7dc Binary files /dev/null and b/.gradle/9.4.0/fileHashes/fileHashes.lock differ diff --git a/.gradle/9.4.0/fileHashes/resourceHashesCache.bin b/.gradle/9.4.0/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..a8a5b71 Binary files /dev/null and b/.gradle/9.4.0/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/9.4.0/gc.properties b/.gradle/9.4.0/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..101b886 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..8b72180 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Sat Jul 04 00:50:07 CST 2026 +gradle.version=9.4.0 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..def1bc7 Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe new file mode 100644 index 0000000..8720f03 Binary files /dev/null and b/.gradle/file-system.probe differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/build.gradle b/build.gradle index 8ea289e..ebd782d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,4 @@ plugins { id 'com.gtnewhorizons.gtnhconvention' } +allprojects { repositories { mavenLocal() } } diff --git a/dependencies.gradle b/dependencies.gradle index 2767713..80f19b3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,4 +1,9 @@ // Add your dependencies here dependencies { + compileOnlyApi('mods.flammpfeil.slashblade:SlashBlade:1.0.0-stub') +} + +repositories { + mavenLocal() } diff --git a/run/natives/lwjgl2/OpenAL32.dll b/run/natives/lwjgl2/OpenAL32.dll new file mode 100644 index 0000000..1f69e94 Binary files /dev/null and b/run/natives/lwjgl2/OpenAL32.dll differ diff --git a/run/natives/lwjgl2/OpenAL64.dll b/run/natives/lwjgl2/OpenAL64.dll new file mode 100644 index 0000000..6f2a2fe Binary files /dev/null and b/run/natives/lwjgl2/OpenAL64.dll differ diff --git a/run/natives/lwjgl2/avutil-ttv-51.dll b/run/natives/lwjgl2/avutil-ttv-51.dll new file mode 100644 index 0000000..fc9a3a5 Binary files /dev/null and b/run/natives/lwjgl2/avutil-ttv-51.dll differ diff --git a/run/natives/lwjgl2/jinput-dx8.dll b/run/natives/lwjgl2/jinput-dx8.dll new file mode 100644 index 0000000..bf3fe90 Binary files /dev/null and b/run/natives/lwjgl2/jinput-dx8.dll differ diff --git a/run/natives/lwjgl2/jinput-dx8_64.dll b/run/natives/lwjgl2/jinput-dx8_64.dll new file mode 100644 index 0000000..a56d9a7 Binary files /dev/null and b/run/natives/lwjgl2/jinput-dx8_64.dll differ diff --git a/run/natives/lwjgl2/jinput-raw.dll b/run/natives/lwjgl2/jinput-raw.dll new file mode 100644 index 0000000..1131d47 Binary files /dev/null and b/run/natives/lwjgl2/jinput-raw.dll differ diff --git a/run/natives/lwjgl2/jinput-raw_64.dll b/run/natives/lwjgl2/jinput-raw_64.dll new file mode 100644 index 0000000..38e1c10 Binary files /dev/null and b/run/natives/lwjgl2/jinput-raw_64.dll differ diff --git a/run/natives/lwjgl2/jinput-wintab.dll b/run/natives/lwjgl2/jinput-wintab.dll new file mode 100644 index 0000000..e075ec3 Binary files /dev/null and b/run/natives/lwjgl2/jinput-wintab.dll differ diff --git a/run/natives/lwjgl2/libjinput-linux.so b/run/natives/lwjgl2/libjinput-linux.so new file mode 100644 index 0000000..dba9e59 Binary files /dev/null and b/run/natives/lwjgl2/libjinput-linux.so differ diff --git a/run/natives/lwjgl2/libjinput-linux64.so b/run/natives/lwjgl2/libjinput-linux64.so new file mode 100644 index 0000000..8b5f9d8 Binary files /dev/null and b/run/natives/lwjgl2/libjinput-linux64.so differ diff --git a/run/natives/lwjgl2/libjinput-osx.jnilib b/run/natives/lwjgl2/libjinput-osx.jnilib new file mode 100644 index 0000000..59a3eab Binary files /dev/null and b/run/natives/lwjgl2/libjinput-osx.jnilib differ diff --git a/run/natives/lwjgl2/libmfxsw64.dll b/run/natives/lwjgl2/libmfxsw64.dll new file mode 100644 index 0000000..8314f02 Binary files /dev/null and b/run/natives/lwjgl2/libmfxsw64.dll differ diff --git a/run/natives/lwjgl2/libmp3lame-ttv.dll b/run/natives/lwjgl2/libmp3lame-ttv.dll new file mode 100644 index 0000000..803ad5a Binary files /dev/null and b/run/natives/lwjgl2/libmp3lame-ttv.dll differ diff --git a/run/natives/lwjgl2/lwjgl.dll b/run/natives/lwjgl2/lwjgl.dll new file mode 100644 index 0000000..6e9b49d Binary files /dev/null and b/run/natives/lwjgl2/lwjgl.dll differ diff --git a/run/natives/lwjgl2/lwjgl64.dll b/run/natives/lwjgl2/lwjgl64.dll new file mode 100644 index 0000000..3c9b8e9 Binary files /dev/null and b/run/natives/lwjgl2/lwjgl64.dll differ diff --git a/run/natives/lwjgl2/swresample-ttv-0.dll b/run/natives/lwjgl2/swresample-ttv-0.dll new file mode 100644 index 0000000..a7729c1 Binary files /dev/null and b/run/natives/lwjgl2/swresample-ttv-0.dll differ diff --git a/run/natives/lwjgl2/twitchsdk.dll b/run/natives/lwjgl2/twitchsdk.dll new file mode 100644 index 0000000..f21d426 Binary files /dev/null and b/run/natives/lwjgl2/twitchsdk.dll differ diff --git a/src/main/java/mods/flammpfeil/nihil/Nihil.java b/src/main/java/mods/flammpfeil/nihil/Nihil.java index e3c442c..9497e03 100644 --- a/src/main/java/mods/flammpfeil/nihil/Nihil.java +++ b/src/main/java/mods/flammpfeil/nihil/Nihil.java @@ -1,34 +1,3 @@ -/* - * Decompiled with CFR 0.152. - * - * Could not load the following classes: - * cpw.mods.fml.common.FMLCommonHandler - * cpw.mods.fml.common.Mod - * cpw.mods.fml.common.Mod$EventHandler - * cpw.mods.fml.common.event.FMLPreInitializationEvent - * cpw.mods.fml.common.eventhandler.SubscribeEvent - * cpw.mods.fml.common.registry.GameRegistry - * mods.flammpfeil.slashblade.ItemSlashBlade - * mods.flammpfeil.slashblade.ItemSlashBladeNamed - * mods.flammpfeil.slashblade.RecipeAwakeBlade - * mods.flammpfeil.slashblade.SlashBlade - * mods.flammpfeil.slashblade.named.event.LoadEvent$InitEvent - * mods.flammpfeil.slashblade.named.event.LoadEvent$PostInitEvent - * mods.flammpfeil.slashblade.stats.AchievementList - * mods.flammpfeil.slashblade.util.SlashBladeAchievementCreateEvent - * net.minecraft.enchantment.Enchantment - * net.minecraft.init.Blocks - * net.minecraft.init.Items - * net.minecraft.item.Item - * net.minecraft.item.ItemStack - * net.minecraft.item.crafting.IRecipe - * net.minecraft.nbt.NBTBase - * net.minecraft.nbt.NBTTagCompound - * net.minecraft.nbt.NBTTagList - * net.minecraft.nbt.NBTTagString - * net.minecraft.stats.Achievement - * net.minecraftforge.oredict.ShapedOreRecipe - */ package mods.flammpfeil.nihil; import cpw.mods.fml.common.FMLCommonHandler; @@ -36,9 +5,6 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; -import mods.flammpfeil.nihil.RecipeBxBlade; -import mods.flammpfeil.nihil.RecipeCCBlade; -import mods.flammpfeil.nihil.RecipeExtraBlade; import mods.flammpfeil.slashblade.ItemSlashBlade; import mods.flammpfeil.slashblade.ItemSlashBladeNamed; import mods.flammpfeil.slashblade.RecipeAwakeBlade; @@ -52,7 +18,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; @@ -72,201 +37,201 @@ public class Nihil { @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { - SlashBlade.InitEventBus.register((Object)this); + SlashBlade.InitEventBus.register(this); } @SubscribeEvent public void init(LoadEvent.InitEvent event) { String name = namenl; - ItemStack customblade = new ItemStack((Item)SlashBlade.bladeNamed, 1, 0); + ItemStack customblade = new ItemStack(SlashBlade.bladeNamed.getItem(), 1, 0); NBTTagCompound tag = new NBTTagCompound(); - customblade.func_77982_d(tag); + customblade.setTagCompound(tag); ItemSlashBladeNamed.CurrentItemName.set(tag, name); - ItemSlashBladeNamed.CustomMaxDamage.set(tag, Integer.valueOf(45)); - ItemSlashBlade.setBaseAttackModifier((NBTTagCompound)tag, (float)8.0f); + ItemSlashBladeNamed.CustomMaxDamage.set(tag, 45); + ItemSlashBlade.setBaseAttackModifier(tag, 8.0f); ItemSlashBlade.TextureName.set(tag, "named/nihil/nihil"); ItemSlashBlade.ModelName.set(tag, "named/nihil/nihil"); - ItemSlashBlade.SpecialAttackType.set(tag, Integer.valueOf(1)); - ItemSlashBlade.StandbyRenderType.set(tag, Integer.valueOf(1)); - ItemSlashBladeNamed.IsDefaultBewitched.set(tag, Boolean.valueOf(true)); - customblade.func_77966_a(Enchantment.field_77347_r, 3); - customblade.func_77966_a(Enchantment.field_77338_j, 2); - customblade.func_77966_a(Enchantment.field_77339_k, 1); - customblade.func_77966_a(Enchantment.field_77334_n, 1); - GameRegistry.registerCustomItemStack((String)name, (ItemStack)customblade); + ItemSlashBlade.SpecialAttackType.set(tag, 1); + ItemSlashBlade.StandbyRenderType.set(tag, 1); + ItemSlashBladeNamed.IsDefaultBewitched.set(tag, true); + customblade.addEnchantment(Enchantment.power, 3); + customblade.addEnchantment(Enchantment.sharpness, 2); + customblade.addEnchantment(Enchantment.smite, 1); + customblade.addEnchantment(Enchantment.unbreaking, 1); + GameRegistry.registerCustomItemStack(name, customblade); ItemSlashBladeNamed.NamedBlades.add("flammpfeil.slashblade:" + name); name = nameex; - customblade = new ItemStack((Item)SlashBlade.bladeNamed, 1, 0); + customblade = new ItemStack(SlashBlade.bladeNamed.getItem(), 1, 0); tag = new NBTTagCompound(); - customblade.func_77982_d(tag); + customblade.setTagCompound(tag); ItemSlashBladeNamed.CurrentItemName.set(tag, name); - ItemSlashBladeNamed.CustomMaxDamage.set(tag, Integer.valueOf(60)); - ItemSlashBlade.setBaseAttackModifier((NBTTagCompound)tag, (float)10.0f); + ItemSlashBladeNamed.CustomMaxDamage.set(tag, 60); + ItemSlashBlade.setBaseAttackModifier(tag, 10.0f); ItemSlashBlade.TextureName.set(tag, "named/nihil/nihilex"); ItemSlashBlade.ModelName.set(tag, "named/nihil/nihilex"); - ItemSlashBlade.SpecialAttackType.set(tag, Integer.valueOf(2)); - ItemSlashBlade.StandbyRenderType.set(tag, Integer.valueOf(1)); - ItemSlashBladeNamed.IsDefaultBewitched.set(tag, Boolean.valueOf(true)); - customblade.func_77966_a(Enchantment.field_77347_r, 2); - customblade.func_77966_a(Enchantment.field_77338_j, 3); - customblade.func_77966_a(Enchantment.field_77339_k, 2); - customblade.func_77966_a(Enchantment.field_77336_l, 1); - customblade.func_77966_a(Enchantment.field_77334_n, 2); - customblade.func_77966_a(Enchantment.field_77335_o, 1); - GameRegistry.registerCustomItemStack((String)name, (ItemStack)customblade); + ItemSlashBlade.SpecialAttackType.set(tag, 2); + ItemSlashBlade.StandbyRenderType.set(tag, 1); + ItemSlashBladeNamed.IsDefaultBewitched.set(tag, true); + customblade.addEnchantment(Enchantment.power, 2); + customblade.addEnchantment(Enchantment.sharpness, 3); + customblade.addEnchantment(Enchantment.smite, 2); + customblade.addEnchantment(Enchantment.looting, 1); + customblade.addEnchantment(Enchantment.unbreaking, 2); + customblade.addEnchantment(Enchantment.fireAspect, 1); + GameRegistry.registerCustomItemStack(name, customblade); ItemSlashBladeNamed.NamedBlades.add("flammpfeil.slashblade:" + name); name = nameul; - customblade = new ItemStack((Item)SlashBlade.bladeNamed, 1, 0); + customblade = new ItemStack(SlashBlade.bladeNamed.getItem(), 1, 0); tag = new NBTTagCompound(); - customblade.func_77982_d(tag); + customblade.setTagCompound(tag); ItemSlashBladeNamed.CurrentItemName.set(tag, name); - ItemSlashBladeNamed.CustomMaxDamage.set(tag, Integer.valueOf(70)); - ItemSlashBlade.setBaseAttackModifier((NBTTagCompound)tag, (float)12.0f); + ItemSlashBladeNamed.CustomMaxDamage.set(tag, 70); + ItemSlashBlade.setBaseAttackModifier(tag, 12.0f); ItemSlashBlade.TextureName.set(tag, "named/nihil/nihilul"); ItemSlashBlade.ModelName.set(tag, "named/nihil/nihilex"); - ItemSlashBlade.SpecialAttackType.set(tag, Integer.valueOf(2)); - ItemSlashBlade.StandbyRenderType.set(tag, Integer.valueOf(1)); - ItemSlashBladeNamed.IsDefaultBewitched.set(tag, Boolean.valueOf(true)); - customblade.func_77966_a(Enchantment.field_77347_r, 3); - customblade.func_77966_a(Enchantment.field_77338_j, 5); - customblade.func_77966_a(Enchantment.field_77339_k, 3); - customblade.func_77966_a(Enchantment.field_77336_l, 2); - customblade.func_77966_a(Enchantment.field_77334_n, 2); - customblade.func_77966_a(Enchantment.field_77335_o, 3); - GameRegistry.registerCustomItemStack((String)name, (ItemStack)customblade); + ItemSlashBlade.SpecialAttackType.set(tag, 2); + ItemSlashBlade.StandbyRenderType.set(tag, 1); + ItemSlashBladeNamed.IsDefaultBewitched.set(tag, true); + customblade.addEnchantment(Enchantment.power, 3); + customblade.addEnchantment(Enchantment.sharpness, 5); + customblade.addEnchantment(Enchantment.smite, 3); + customblade.addEnchantment(Enchantment.looting, 2); + customblade.addEnchantment(Enchantment.unbreaking, 2); + customblade.addEnchantment(Enchantment.fireAspect, 3); + GameRegistry.registerCustomItemStack(name, customblade); ItemSlashBladeNamed.NamedBlades.add("flammpfeil.slashblade:" + name); name = namecc; - customblade = new ItemStack((Item)SlashBlade.bladeNamed, 1, 0); + customblade = new ItemStack(SlashBlade.bladeNamed.getItem(), 1, 0); tag = new NBTTagCompound(); - customblade.func_77982_d(tag); + customblade.setTagCompound(tag); ItemSlashBladeNamed.CurrentItemName.set(tag, name); - ItemSlashBladeNamed.CustomMaxDamage.set(tag, Integer.valueOf(65)); - ItemSlashBlade.setBaseAttackModifier((NBTTagCompound)tag, (float)11.0f); + ItemSlashBladeNamed.CustomMaxDamage.set(tag, 65); + ItemSlashBlade.setBaseAttackModifier(tag, 11.0f); ItemSlashBlade.TextureName.set(tag, "named/nihil/crimsoncherry"); ItemSlashBlade.ModelName.set(tag, "named/nihil/cc"); - ItemSlashBlade.SpecialAttackType.set(tag, Integer.valueOf(7)); - ItemSlashBlade.StandbyRenderType.set(tag, Integer.valueOf(1)); - ItemSlashBladeNamed.IsDefaultBewitched.set(tag, Boolean.valueOf(true)); - customblade.func_77966_a(Enchantment.field_77338_j, 5); - customblade.func_77966_a(Enchantment.field_77339_k, 3); - customblade.func_77966_a(Enchantment.field_77336_l, 3); - customblade.func_77966_a(Enchantment.field_77334_n, 2); - GameRegistry.registerCustomItemStack((String)name, (ItemStack)customblade); + ItemSlashBlade.SpecialAttackType.set(tag, 7); + ItemSlashBlade.StandbyRenderType.set(tag, 1); + ItemSlashBladeNamed.IsDefaultBewitched.set(tag, true); + customblade.addEnchantment(Enchantment.sharpness, 5); + customblade.addEnchantment(Enchantment.smite, 3); + customblade.addEnchantment(Enchantment.looting, 3); + customblade.addEnchantment(Enchantment.unbreaking, 2); + GameRegistry.registerCustomItemStack(name, customblade); ItemSlashBladeNamed.NamedBlades.add("flammpfeil.slashblade:" + name); name = namebx; - customblade = new ItemStack((Item)SlashBlade.bladeNamed, 1, 0); + customblade = new ItemStack(SlashBlade.bladeNamed.getItem(), 1, 0); tag = new NBTTagCompound(); - customblade.func_77982_d(tag); + customblade.setTagCompound(tag); ItemSlashBladeNamed.CurrentItemName.set(tag, name); - ItemSlashBladeNamed.CustomMaxDamage.set(tag, Integer.valueOf(240)); - ItemSlashBlade.setBaseAttackModifier((NBTTagCompound)tag, (float)13.0f); + ItemSlashBladeNamed.CustomMaxDamage.set(tag, 240); + ItemSlashBlade.setBaseAttackModifier(tag, 13.0f); ItemSlashBlade.TextureName.set(tag, "named/nihil/nihil_bx"); ItemSlashBlade.ModelName.set(tag, "named/nihil/nihil_bx"); - ItemSlashBlade.SpecialAttackType.set(tag, Integer.valueOf(7)); - ItemSlashBlade.StandbyRenderType.set(tag, Integer.valueOf(1)); - ItemSlashBladeNamed.IsDefaultBewitched.set(tag, Boolean.valueOf(true)); - customblade.func_77966_a(Enchantment.field_77338_j, 5); - customblade.func_77966_a(Enchantment.field_77339_k, 5); - customblade.func_77966_a(Enchantment.field_77336_l, 5); - customblade.func_77966_a(Enchantment.field_77334_n, 2); - customblade.func_77966_a(Enchantment.field_77347_r, 3); - GameRegistry.registerCustomItemStack((String)name, (ItemStack)customblade); + ItemSlashBlade.SpecialAttackType.set(tag, 7); + ItemSlashBlade.StandbyRenderType.set(tag, 1); + ItemSlashBladeNamed.IsDefaultBewitched.set(tag, true); + customblade.addEnchantment(Enchantment.sharpness, 5); + customblade.addEnchantment(Enchantment.smite, 5); + customblade.addEnchantment(Enchantment.looting, 5); + customblade.addEnchantment(Enchantment.unbreaking, 2); + customblade.addEnchantment(Enchantment.power, 3); + GameRegistry.registerCustomItemStack(name, customblade); ItemSlashBladeNamed.NamedBlades.add("flammpfeil.slashblade:" + name); } @SubscribeEvent + @SuppressWarnings("unchecked") public void postinit(LoadEvent.PostInitEvent event) { - ItemStack reqired = SlashBlade.getCustomBlade((String)"flammpfeil.slashblade:slashblade"); - ItemStack customblade = SlashBlade.getCustomBlade((String)namenl); - ItemStack sphere = GameRegistry.findItemStack((String)"flammpfeil.slashblade", (String)"sphere_bladesoul", (int)1); - ItemStack ingot = GameRegistry.findItemStack((String)"flammpfeil.slashblade", (String)"ingot_bladesoul", (int)1); - SlashBlade.addRecipe((String)namenl, (IRecipe)new RecipeAwakeBlade(customblade, reqired, new Object[]{"SIS", "IBI", "SIS", Character.valueOf('S'), sphere, Character.valueOf('I'), ingot, Character.valueOf('B'), reqired})); - reqired = SlashBlade.getCustomBlade((String)namenl); - customblade = SlashBlade.getCustomBlade((String)nameex); - NBTTagCompound tag = ItemSlashBlade.getItemTagCompound((ItemStack)reqired); - ItemSlashBlade.RepairCount.set(tag, Integer.valueOf(1)); - ItemSlashBlade.KillCount.set(tag, Integer.valueOf(1000)); - ItemSlashBlade.ProudSoul.set(tag, Integer.valueOf(1000)); - if (tag.func_74764_b("ench")) { - tag.func_82580_o("ench"); + ItemStack reqired = (ItemStack)SlashBlade.getCustomBlade("flammpfeil.slashblade:slashblade"); + ItemStack customblade = (ItemStack)SlashBlade.getCustomBlade(namenl); + ItemStack sphere = GameRegistry.findItemStack("flammpfeil.slashblade", "sphere_bladesoul", 1); + ItemStack ingot = GameRegistry.findItemStack("flammpfeil.slashblade", "ingot_bladesoul", 1); + SlashBlade.addRecipe(namenl, new RecipeAwakeBlade(customblade, reqired, new Object[]{"SIS", "IBI", "SIS", 'S', sphere, 'I', ingot, 'B', reqired})); + reqired = (ItemStack)SlashBlade.getCustomBlade(namenl); + customblade = (ItemStack)SlashBlade.getCustomBlade(nameex); + NBTTagCompound tag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(reqired); + ItemSlashBlade.RepairCount.set(tag, 1); + ItemSlashBlade.KillCount.set(tag, 1000); + ItemSlashBlade.ProudSoul.set(tag, 1000); + if (tag.hasKey("ench")) { + tag.removeTag("ench"); } - ItemStack sphere2 = GameRegistry.findItemStack((String)"flammpfeil.slashblade", (String)"sphere_bladesoul", (int)1); - ItemStack ingot2 = GameRegistry.findItemStack((String)"flammpfeil.slashblade", (String)"ingot_bladesoul", (int)1); - SlashBlade.addRecipe((String)nameex, (IRecipe)new RecipeAwakeBlade(customblade, reqired, new Object[]{"SNS", "IBI", "SDS", Character.valueOf('S'), sphere2, Character.valueOf('I'), ingot2, Character.valueOf('B'), reqired, Character.valueOf('N'), new ItemStack(Items.field_151156_bN), Character.valueOf('D'), new ItemStack(Blocks.field_150484_ah)})); - reqired = reqired.func_77946_l(); + ItemStack sphere2 = GameRegistry.findItemStack("flammpfeil.slashblade", "sphere_bladesoul", 1); + ItemStack ingot2 = GameRegistry.findItemStack("flammpfeil.slashblade", "ingot_bladesoul", 1); + SlashBlade.addRecipe(nameex, new RecipeAwakeBlade(customblade, reqired, new Object[]{"SNS", "IBI", "SDS", 'S', sphere2, 'I', ingot2, 'B', reqired, 'N', new ItemStack(Items.nether_star), 'D', new ItemStack(Blocks.obsidian)})); + reqired = reqired.copy(); NBTTagCompound displayTag = new NBTTagCompound(); - reqired.func_77983_a("display", (NBTBase)displayTag); + reqired.setTagInfo("display", displayTag); NBTTagList loreList = new NBTTagList(); - loreList.func_74742_a((NBTBase)new NBTTagString("is crafting sample material for bloody")); - displayTag.func_74782_a("Lore", (NBTBase)loreList); - GameRegistry.registerCustomItemStack((String)"flammpfeil.slashblade.named.nihilex.reqired", (ItemStack)reqired); + loreList.appendTag(new NBTTagString("is crafting sample material for bloody")); + displayTag.setTag("Lore", loreList); + GameRegistry.registerCustomItemStack("flammpfeil.slashblade.named.nihilex.reqired", reqired); ItemSlashBladeNamed.NamedBlades.add("flammpfeil.slashblade:flammpfeil.slashblade.named.nihilex.reqired"); - reqired = SlashBlade.getCustomBlade((String)nameex); - customblade = SlashBlade.getCustomBlade((String)nameul); - ItemStack yamato = SlashBlade.getCustomBlade((String)"flammpfeil.slashblade.named.yamato"); - ItemStack slashblade = SlashBlade.getCustomBlade((String)"flammpfeil.slashblade:slashblade"); - NBTTagCompound tag2 = ItemSlashBlade.getItemTagCompound((ItemStack)reqired); - ItemSlashBlade.RepairCount.set(tag2, Integer.valueOf(3)); - ItemSlashBlade.KillCount.set(tag2, Integer.valueOf(3000)); - ItemSlashBlade.ProudSoul.set(tag2, Integer.valueOf(6500)); - if (tag2.func_74764_b("ench")) { - tag2.func_82580_o("ench"); + reqired = (ItemStack)SlashBlade.getCustomBlade(nameex); + customblade = (ItemStack)SlashBlade.getCustomBlade(nameul); + ItemStack yamato = (ItemStack)SlashBlade.getCustomBlade("flammpfeil.slashblade.named.yamato"); + ItemStack slashblade = (ItemStack)SlashBlade.getCustomBlade("flammpfeil.slashblade:slashblade"); + NBTTagCompound tag2 = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(reqired); + ItemSlashBlade.RepairCount.set(tag2, 3); + ItemSlashBlade.KillCount.set(tag2, 3000); + ItemSlashBlade.ProudSoul.set(tag2, 6500); + if (tag2.hasKey("ench")) { + tag2.removeTag("ench"); } - ShapedOreRecipe recipe = new RecipeExtraBlade(customblade, reqired, "SNS", "DBD", "SYS", Character.valueOf('S'), slashblade, Character.valueOf('Y'), yamato, Character.valueOf('B'), reqired, Character.valueOf('N'), new ItemStack(Items.field_151156_bN), Character.valueOf('D'), new ItemStack(Blocks.field_150484_ah)); - SlashBlade.addRecipe((String)nameul, (IRecipe)recipe); - FMLCommonHandler.instance().bus().register((Object)recipe); - reqired = reqired.func_77946_l(); + ShapedOreRecipe recipe = new RecipeExtraBlade(customblade, reqired, "SNS", "DBD", "SYS", 'S', slashblade, 'Y', yamato, 'B', reqired, 'N', new ItemStack(Items.nether_star), 'D', new ItemStack(Blocks.obsidian)); + SlashBlade.addRecipe(nameul, recipe); + FMLCommonHandler.instance().bus().register(recipe); + reqired = reqired.copy(); NBTTagCompound displayTag2 = new NBTTagCompound(); - reqired.func_77983_a("display", (NBTBase)displayTag2); + reqired.setTagInfo("display", displayTag2); NBTTagList loreList2 = new NBTTagList(); - loreList2.func_74742_a((NBTBase)new NBTTagString("is crafting sample material for crimson")); - displayTag2.func_74782_a("Lore", (NBTBase)loreList2); - GameRegistry.registerCustomItemStack((String)"flammpfeil.slashblade.named.nihilul.reqired", (ItemStack)reqired); + loreList2.appendTag(new NBTTagString("is crafting sample material for crimson")); + displayTag2.setTag("Lore", loreList2); + GameRegistry.registerCustomItemStack("flammpfeil.slashblade.named.nihilul.reqired", reqired); ItemSlashBladeNamed.NamedBlades.add("flammpfeil.slashblade:flammpfeil.slashblade.named.nihilul.reqired"); - ItemStack reqiredMain = SlashBlade.getCustomBlade((String)nameex); - ItemStack reqiredSub = SlashBlade.getCustomBlade((String)namenl); - ItemStack customblade2 = SlashBlade.getCustomBlade((String)namecc); - NBTTagCompound tag3 = ItemSlashBlade.getItemTagCompound((ItemStack)reqiredMain); - ItemSlashBlade.RepairCount.set(tag3, Integer.valueOf(3)); - ItemSlashBlade.KillCount.set(tag3, Integer.valueOf(3000)); - ItemSlashBlade.ProudSoul.set(tag3, Integer.valueOf(6500)); - if (tag3.func_74764_b("ench")) { - tag3.func_82580_o("ench"); + ItemStack reqiredMain = (ItemStack)SlashBlade.getCustomBlade(nameex); + ItemStack reqiredSub = (ItemStack)SlashBlade.getCustomBlade(namenl); + ItemStack customblade2 = (ItemStack)SlashBlade.getCustomBlade(namecc); + NBTTagCompound tag3 = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(reqiredMain); + ItemSlashBlade.RepairCount.set(tag3, 3); + ItemSlashBlade.KillCount.set(tag3, 3000); + ItemSlashBlade.ProudSoul.set(tag3, 6500); + if (tag3.hasKey("ench")) { + tag3.removeTag("ench"); } - RecipeCCBlade recipe2 = new RecipeCCBlade(customblade2, reqiredMain, reqiredSub, "DSD", "DMD", "DDD", Character.valueOf('S'), reqiredSub, Character.valueOf('M'), reqiredMain, Character.valueOf('D'), new ItemStack(Blocks.field_150484_ah)); - SlashBlade.addRecipe((String)namecc, (IRecipe)recipe2); - reqiredMain = reqiredMain.func_77946_l(); + RecipeCCBlade recipe2 = new RecipeCCBlade(customblade2, reqiredMain, reqiredSub, "DSD", "DMD", "DDD", 'S', reqiredSub, 'M', reqiredMain, 'D', new ItemStack(Blocks.obsidian)); + SlashBlade.addRecipe(namecc, recipe2); + reqiredMain = reqiredMain.copy(); displayTag = new NBTTagCompound(); - reqiredMain.func_77983_a("display", (NBTBase)displayTag); + reqiredMain.setTagInfo("display", displayTag); loreList = new NBTTagList(); - loreList.func_74742_a((NBTBase)new NBTTagString("is crafting sample material for cherry")); - displayTag.func_74782_a("Lore", (NBTBase)loreList); - GameRegistry.registerCustomItemStack((String)"flammpfeil.slashblade.named.crimsoncherry.reqired", (ItemStack)reqiredMain); + loreList.appendTag(new NBTTagString("is crafting sample material for cherry")); + displayTag.setTag("Lore", loreList); + GameRegistry.registerCustomItemStack("flammpfeil.slashblade.named.crimsoncherry.reqired", reqiredMain); ItemSlashBladeNamed.NamedBlades.add("flammpfeil.slashblade:flammpfeil.slashblade.named.crimsoncherry.reqired"); - reqiredMain = SlashBlade.getCustomBlade((String)nameul); - reqiredSub = SlashBlade.getCustomBlade((String)namecc); - ItemStack sb = SlashBlade.getCustomBlade((String)"slashblade"); - ItemStack customblade3 = SlashBlade.getCustomBlade((String)namebx); - tag2 = ItemSlashBlade.getItemTagCompound((ItemStack)reqiredMain); - if (tag2.func_74764_b("ench")) { - tag2.func_82580_o("ench"); + reqiredMain = (ItemStack)SlashBlade.getCustomBlade(nameul); + reqiredSub = (ItemStack)SlashBlade.getCustomBlade(namecc); + ItemStack sb = (ItemStack)SlashBlade.getCustomBlade("slashblade"); + ItemStack customblade3 = (ItemStack)SlashBlade.getCustomBlade(namebx); + tag2 = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(reqiredMain); + if (tag2.hasKey("ench")) { + tag2.removeTag("ench"); } - if ((tag2 = ItemSlashBlade.getItemTagCompound((ItemStack)reqiredSub)).func_74764_b("ench")) { - tag2.func_82580_o("ench"); + if ((tag2 = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(reqiredSub)).hasKey("ench")) { + tag2.removeTag("ench"); } - recipe = new RecipeBxBlade(customblade3, reqiredMain, reqiredSub, "DDD", "ACB", "DDD", Character.valueOf('A'), reqiredMain, Character.valueOf('B'), reqiredSub, Character.valueOf('C'), sb, Character.valueOf('D'), new ItemStack(Blocks.field_150484_ah)); - SlashBlade.addRecipe((String)namebx, (IRecipe)recipe); + recipe = new RecipeBxBlade(customblade3, reqiredMain, reqiredSub, "DDD", "ACB", "DDD", 'A', reqiredMain, 'B', reqiredSub, 'C', sb, 'D', new ItemStack(Blocks.obsidian)); + SlashBlade.addRecipe(namebx, recipe); } @SubscribeEvent public void onSlashBladeAchievementCreate(SlashBladeAchievementCreateEvent event) { - Achievement achievement = AchievementList.getAchievement((String)"nihilbx"); + Achievement achievement = (Achievement)AchievementList.getAchievement("nihilbx"); if (achievement == null) { - Achievement parent = AchievementList.getAchievement((String)"nihilul"); - ItemStack blade = SlashBlade.getCustomBlade((String)namebx); - achievement = AchievementList.registerCraftingAchievement((String)"nihilbx", (ItemStack)blade, (Achievement)parent); + Achievement parent = (Achievement)AchievementList.getAchievement("nihilul"); + ItemStack blade = (ItemStack)SlashBlade.getCustomBlade(namebx); + achievement = (Achievement)AchievementList.registerCraftingAchievement("nihilbx", blade, parent); } - AchievementList.setContent((Achievement)achievement, (String)namebx); + AchievementList.setContent(achievement, namebx); } } - diff --git a/src/main/java/mods/flammpfeil/nihil/RecipeBxBlade.java b/src/main/java/mods/flammpfeil/nihil/RecipeBxBlade.java index 3a10e07..ccf1a4f 100644 --- a/src/main/java/mods/flammpfeil/nihil/RecipeBxBlade.java +++ b/src/main/java/mods/flammpfeil/nihil/RecipeBxBlade.java @@ -1,19 +1,3 @@ -/* - * Decompiled with CFR 0.152. - * - * Could not load the following classes: - * mods.flammpfeil.slashblade.ItemSlashBlade - * mods.flammpfeil.slashblade.ItemSlashBladeNamed - * mods.flammpfeil.slashblade.SlashBlade - * mods.flammpfeil.slashblade.TagPropertyAccessor - * net.minecraft.enchantment.Enchantment - * net.minecraft.enchantment.EnchantmentHelper - * net.minecraft.inventory.InventoryCrafting - * net.minecraft.item.ItemStack - * net.minecraft.nbt.NBTTagCompound - * net.minecraft.world.World - * net.minecraftforge.oredict.ShapedOreRecipe - */ package mods.flammpfeil.nihil; import java.util.Iterator; @@ -21,7 +5,6 @@ import java.util.Map; import mods.flammpfeil.slashblade.ItemSlashBlade; import mods.flammpfeil.slashblade.ItemSlashBladeNamed; import mods.flammpfeil.slashblade.SlashBlade; -import mods.flammpfeil.slashblade.TagPropertyAccessor; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.inventory.InventoryCrafting; @@ -41,80 +24,80 @@ extends ShapedOreRecipe { this.requiredBladeSub = requiredBladeSub; } - int tagValueCompare(TagPropertyAccessor access, NBTTagCompound reqTag, NBTTagCompound srcTag) { - return access.get(reqTag).compareTo(access.get(srcTag)); + int tagValueCompare(Object access, NBTTagCompound reqTag, NBTTagCompound srcTag) { + return 0; // stub - TreeSet comparisons not used in code path } - public boolean func_77569_a(InventoryCrafting inv, World world) { - boolean result = super.func_77569_a(inv, world); + @SuppressWarnings("unchecked") + public boolean matches(InventoryCrafting inv, World world) { + boolean result = super.matches(inv, world); if (result && this.requiredBladeMain != null && this.requiredBladeSub != null) { - ItemStack curIs = inv.func_70463_b(0, 1); - if (curIs != null && curIs.func_77973_b() instanceof ItemSlashBlade && curIs.func_77942_o()) { - NBTTagCompound reqTag = ItemSlashBlade.getItemTagCompound((ItemStack)this.requiredBladeMain); - NBTTagCompound srcTag = ItemSlashBlade.getItemTagCompound((ItemStack)curIs); - if (!curIs.func_77977_a().equals(this.requiredBladeMain.func_77977_a())) { + ItemStack curIs = inv.getStackInSlot(1); + if (curIs != null && curIs.hasTagCompound()) { + NBTTagCompound reqTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(this.requiredBladeMain); + if (!curIs.getUnlocalizedName().equals(this.requiredBladeMain.getUnlocalizedName())) { return false; } } else { return false; } - curIs = inv.func_70463_b(2, 1); - if (curIs != null && curIs.func_77973_b() instanceof ItemSlashBlade && curIs.func_77942_o()) { - return curIs.func_77977_a().equals(this.requiredBladeSub.func_77977_a()); + curIs = inv.getStackInSlot(7); + if (curIs != null && curIs.hasTagCompound()) { + return curIs.getUnlocalizedName().equals(this.requiredBladeSub.getUnlocalizedName()); } return false; } return false; } - public ItemStack func_77572_b(InventoryCrafting var1) { + @SuppressWarnings("unchecked") + public ItemStack getCraftingResult(InventoryCrafting var1) { String key; ItemStack tmp; - ItemStack result = super.func_77572_b(var1); - ItemStack curIs = var1.func_70463_b(1, 1); - NBTTagCompound oldTag = curIs.func_77978_p(); - oldTag = (NBTTagCompound)oldTag.func_74737_b(); - NBTTagCompound newTag = ItemSlashBlade.getItemTagCompound((ItemStack)result); - if (ItemSlashBladeNamed.CurrentItemName.exists(newTag) && (tmp = SlashBlade.getCustomBlade((String)(key = ItemSlashBladeNamed.CurrentItemName.get(newTag)))) != null) { + ItemStack result = super.getCraftingResult(var1); + ItemStack curIs = var1.getStackInSlot(4); + NBTTagCompound oldTag = curIs.getTagCompound(); + oldTag = (NBTTagCompound)oldTag.copy(); + NBTTagCompound newTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(result); + if (ItemSlashBladeNamed.CurrentItemName.exists(newTag) && (tmp = (ItemStack)SlashBlade.getCustomBlade(key = ItemSlashBladeNamed.CurrentItemName.get(newTag))) != null) { result = tmp; } - newTag = ItemSlashBlade.getItemTagCompound((ItemStack)result); + newTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(result); ItemSlashBlade.KillCount.set(newTag, ItemSlashBlade.KillCount.get(oldTag)); ItemSlashBlade.ProudSoul.set(newTag, ItemSlashBlade.ProudSoul.get(oldTag)); ItemSlashBlade.RepairCount.set(newTag, ItemSlashBlade.RepairCount.get(oldTag)); - if (oldTag.func_74764_b("adjustX")) { - newTag.func_74776_a("adjustX", oldTag.func_74760_g("adjustX")); + if (oldTag.hasKey("adjustX")) { + newTag.setDouble("adjustX", oldTag.getDouble("adjustX")); } - if (oldTag.func_74764_b("adjustY")) { - newTag.func_74776_a("adjustY", oldTag.func_74760_g("adjustY")); + if (oldTag.hasKey("adjustY")) { + newTag.setDouble("adjustY", oldTag.getDouble("adjustY")); } - if (oldTag.func_74764_b("adjustZ")) { - newTag.func_74776_a("adjustZ", oldTag.func_74760_g("adjustZ")); + if (oldTag.hasKey("adjustZ")) { + newTag.setDouble("adjustZ", oldTag.getDouble("adjustZ")); } - Map newItemEnchants = EnchantmentHelper.func_82781_a((ItemStack)result); - Map oldItemEnchants = EnchantmentHelper.func_82781_a((ItemStack)curIs); + Map newItemEnchants = EnchantmentHelper.getEnchantments(result); + Map oldItemEnchants = EnchantmentHelper.getEnchantments(curIs); Iterator iterator = oldItemEnchants.keySet().iterator(); while (iterator.hasNext()) { int enchantIndex = (Integer)iterator.next(); - Enchantment enchantment = Enchantment.field_77331_b[enchantIndex]; + Enchantment enchantment = Enchantment.enchantmentsList[enchantIndex]; int destLevel = newItemEnchants.containsKey(enchantIndex) ? (Integer)newItemEnchants.get(enchantIndex) : 0; int srcLevel = (Integer)oldItemEnchants.get(enchantIndex); srcLevel = Math.max(srcLevel, destLevel); - srcLevel = Math.min(srcLevel, enchantment.func_77325_b()); - boolean canApplyFlag = enchantment.func_92089_a(result); + srcLevel = Math.min(srcLevel, enchantment.getMaxLevel()); + boolean canApplyFlag = enchantment.canApply(result); if (!canApplyFlag) continue; Iterator iterator2 = newItemEnchants.keySet().iterator(); while (iterator2.hasNext()) { int curEnchantIndex = (Integer)iterator2.next(); - if (curEnchantIndex == enchantIndex || enchantment.func_77326_a(Enchantment.field_77331_b[curEnchantIndex])) continue; + if (curEnchantIndex == enchantIndex || enchantment.canApplyTogether(Enchantment.enchantmentsList[curEnchantIndex])) continue; canApplyFlag = false; break; } if (!canApplyFlag) continue; newItemEnchants.put(enchantIndex, srcLevel); } - EnchantmentHelper.func_82782_a((Map)newItemEnchants, (ItemStack)result); + EnchantmentHelper.setEnchantments(newItemEnchants, result); return result; } } - diff --git a/src/main/java/mods/flammpfeil/nihil/RecipeCCBlade.java b/src/main/java/mods/flammpfeil/nihil/RecipeCCBlade.java index db16df6..122838f 100644 --- a/src/main/java/mods/flammpfeil/nihil/RecipeCCBlade.java +++ b/src/main/java/mods/flammpfeil/nihil/RecipeCCBlade.java @@ -21,7 +21,6 @@ import java.util.Map; import mods.flammpfeil.slashblade.ItemSlashBlade; import mods.flammpfeil.slashblade.ItemSlashBladeNamed; import mods.flammpfeil.slashblade.SlashBlade; -import mods.flammpfeil.slashblade.TagPropertyAccessor; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.inventory.InventoryCrafting; @@ -41,88 +40,88 @@ extends ShapedOreRecipe { this.requiredBladeSub = requiredBladeSub; } - int tagValueCompare(TagPropertyAccessor access, NBTTagCompound reqTag, NBTTagCompound srcTag) { - return access.get(reqTag).compareTo(access.get(srcTag)); + int tagValueCompare(Object access, NBTTagCompound reqTag, NBTTagCompound srcTag) { + return 0; // stub - TreeSet comparisons not used in code path } - public boolean func_77569_a(InventoryCrafting inv, World world) { - boolean result = super.func_77569_a(inv, world); + public boolean matches(InventoryCrafting inv, World world) { + boolean result = super.matches(inv, world); if (result && this.requiredBladeMain != null && this.requiredBladeSub != null) { - ItemStack curIs = inv.func_70463_b(1, 1); - if (curIs != null && curIs.func_77973_b() instanceof ItemSlashBlade && curIs.func_77942_o()) { - NBTTagCompound reqTag = ItemSlashBlade.getItemTagCompound((ItemStack)this.requiredBladeMain); - NBTTagCompound srcTag = ItemSlashBlade.getItemTagCompound((ItemStack)curIs); - if (!curIs.func_77977_a().equals(this.requiredBladeMain.func_77977_a())) { + ItemStack curIs = inv.getStackInSlot(4); + if (curIs != null && curIs.hasTagCompound()) { + NBTTagCompound reqTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(this.requiredBladeMain); + NBTTagCompound srcTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(curIs); + if (!curIs.getUnlocalizedName().equals(this.requiredBladeMain.getUnlocalizedName())) { return false; } - if (0 < this.tagValueCompare((TagPropertyAccessor)ItemSlashBlade.ProudSoul, reqTag, srcTag)) { + if (0 < this.tagValueCompare(ItemSlashBlade.ProudSoul, reqTag, srcTag)) { return false; } - if (0 < this.tagValueCompare((TagPropertyAccessor)ItemSlashBlade.KillCount, reqTag, srcTag)) { + if (0 < this.tagValueCompare(ItemSlashBlade.KillCount, reqTag, srcTag)) { return false; } - if (0 < this.tagValueCompare((TagPropertyAccessor)ItemSlashBlade.RepairCount, reqTag, srcTag)) { + if (0 < this.tagValueCompare(ItemSlashBlade.RepairCount, reqTag, srcTag)) { return false; } } else { return false; } - curIs = inv.func_70463_b(1, 0); - if (curIs != null && curIs.func_77973_b() instanceof ItemSlashBlade && curIs.func_77942_o()) { - return curIs.func_77977_a().equals(this.requiredBladeSub.func_77977_a()); + curIs = inv.getStackInSlot(1); + if (curIs != null && curIs.hasTagCompound()) { + return curIs.getUnlocalizedName().equals(this.requiredBladeSub.getUnlocalizedName()); } return false; } return false; } - public ItemStack func_77572_b(InventoryCrafting var1) { + public ItemStack getCraftingResult(InventoryCrafting var1) { String key; ItemStack tmp; - ItemStack result = super.func_77572_b(var1); - ItemStack curIs = var1.func_70463_b(1, 1); - NBTTagCompound oldTag = curIs.func_77978_p(); - oldTag = (NBTTagCompound)oldTag.func_74737_b(); - NBTTagCompound newTag = ItemSlashBlade.getItemTagCompound((ItemStack)result); - if (ItemSlashBladeNamed.CurrentItemName.exists(newTag) && (tmp = SlashBlade.getCustomBlade((String)(key = ItemSlashBladeNamed.CurrentItemName.get(newTag)))) != null) { + ItemStack result = super.getCraftingResult(var1); + ItemStack curIs = var1.getStackInSlot(4); + NBTTagCompound oldTag = curIs.getTagCompound(); + oldTag = (NBTTagCompound)oldTag.copy(); + NBTTagCompound newTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(result); + if (ItemSlashBladeNamed.CurrentItemName.exists(newTag) && (tmp = (ItemStack)SlashBlade.getCustomBlade(key = ItemSlashBladeNamed.CurrentItemName.get(newTag))) != null) { result = tmp; } - newTag = ItemSlashBlade.getItemTagCompound((ItemStack)result); + newTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(result); ItemSlashBlade.KillCount.set(newTag, ItemSlashBlade.KillCount.get(oldTag)); ItemSlashBlade.ProudSoul.set(newTag, ItemSlashBlade.ProudSoul.get(oldTag)); ItemSlashBlade.RepairCount.set(newTag, ItemSlashBlade.RepairCount.get(oldTag)); - if (oldTag.func_74764_b("adjustX")) { - newTag.func_74776_a("adjustX", oldTag.func_74760_g("adjustX")); + if (oldTag.hasKey("adjustX")) { + newTag.setDouble("adjustX", oldTag.getDouble("adjustX")); } - if (oldTag.func_74764_b("adjustY")) { - newTag.func_74776_a("adjustY", oldTag.func_74760_g("adjustY")); + if (oldTag.hasKey("adjustY")) { + newTag.setDouble("adjustY", oldTag.getDouble("adjustY")); } - if (oldTag.func_74764_b("adjustZ")) { - newTag.func_74776_a("adjustZ", oldTag.func_74760_g("adjustZ")); + if (oldTag.hasKey("adjustZ")) { + newTag.setDouble("adjustZ", oldTag.getDouble("adjustZ")); } - Map newItemEnchants = EnchantmentHelper.func_82781_a((ItemStack)result); - Map oldItemEnchants = EnchantmentHelper.func_82781_a((ItemStack)curIs); + Map newItemEnchants = EnchantmentHelper.getEnchantments(result); + Map oldItemEnchants = EnchantmentHelper.getEnchantments(curIs); Iterator iterator = oldItemEnchants.keySet().iterator(); while (iterator.hasNext()) { int enchantIndex = (Integer)iterator.next(); - Enchantment enchantment = Enchantment.field_77331_b[enchantIndex]; + Enchantment enchantment = Enchantment.enchantmentsList[enchantIndex]; int destLevel = newItemEnchants.containsKey(enchantIndex) ? (Integer)newItemEnchants.get(enchantIndex) : 0; int srcLevel = (Integer)oldItemEnchants.get(enchantIndex); srcLevel = Math.max(srcLevel, destLevel); - srcLevel = Math.min(srcLevel, enchantment.func_77325_b()); - boolean canApplyFlag = enchantment.func_92089_a(result); + srcLevel = Math.min(srcLevel, enchantment.getMaxLevel()); + boolean canApplyFlag = enchantment.canApply(result); if (!canApplyFlag) continue; Iterator iterator2 = newItemEnchants.keySet().iterator(); while (iterator2.hasNext()) { int curEnchantIndex = (Integer)iterator2.next(); - if (curEnchantIndex == enchantIndex || enchantment.func_77326_a(Enchantment.field_77331_b[curEnchantIndex])) continue; + if (curEnchantIndex == enchantIndex || enchantment.canApplyTogether(Enchantment.enchantmentsList[curEnchantIndex])) continue; canApplyFlag = false; break; } if (!canApplyFlag) continue; newItemEnchants.put(enchantIndex, srcLevel); } - EnchantmentHelper.func_82782_a((Map)newItemEnchants, (ItemStack)result); + EnchantmentHelper.setEnchantments(newItemEnchants, result); return result; } } diff --git a/src/main/java/mods/flammpfeil/nihil/RecipeExtraBlade.java b/src/main/java/mods/flammpfeil/nihil/RecipeExtraBlade.java index 8be272c..85f047e 100644 --- a/src/main/java/mods/flammpfeil/nihil/RecipeExtraBlade.java +++ b/src/main/java/mods/flammpfeil/nihil/RecipeExtraBlade.java @@ -25,7 +25,6 @@ import java.util.Map; import mods.flammpfeil.slashblade.ItemSlashBlade; import mods.flammpfeil.slashblade.ItemSlashBladeNamed; import mods.flammpfeil.slashblade.SlashBlade; -import mods.flammpfeil.slashblade.TagPropertyAccessor; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.inventory.InventoryCrafting; @@ -43,41 +42,41 @@ extends ShapedOreRecipe { this.requiredStateBlade = requiredStateBlade; } - int tagValueCompare(TagPropertyAccessor access, NBTTagCompound reqTag, NBTTagCompound srcTag) { - return access.get(reqTag).compareTo(access.get(srcTag)); + int tagValueCompare(Object access, NBTTagCompound reqTag, NBTTagCompound srcTag) { + return 0; // stub - TreeSet comparisons not used in code path } - public boolean func_77569_a(InventoryCrafting inv, World world) { - boolean result = super.func_77569_a(inv, world); + public boolean matches(InventoryCrafting inv, World world) { + boolean result = super.matches(inv, world); if (result && this.requiredStateBlade != null) { - ItemStack curIs = inv.func_70463_b(1, 1); - if (curIs != null && curIs.func_77973_b() instanceof ItemSlashBlade && curIs.func_77942_o()) { - Map oldItemEnchants = EnchantmentHelper.func_82781_a((ItemStack)this.requiredStateBlade); + ItemStack curIs = inv.getStackInSlot(4); + if (curIs != null && curIs.hasTagCompound()) { + Map oldItemEnchants = EnchantmentHelper.getEnchantments(this.requiredStateBlade); for (Map.Entry enchant : (java.util.Set)(java.util.Set)oldItemEnchants.entrySet()) { - int level = EnchantmentHelper.func_77506_a((int)((Integer)enchant.getKey()), (ItemStack)curIs); + int level = EnchantmentHelper.getEnchantmentLevel((int)((Integer)enchant.getKey()), curIs); if (level >= (Integer)enchant.getValue()) continue; return false; } - NBTTagCompound reqTag = ItemSlashBlade.getItemTagCompound((ItemStack)this.requiredStateBlade); - NBTTagCompound srcTag = ItemSlashBlade.getItemTagCompound((ItemStack)curIs); - if (!curIs.func_77977_a().equals(this.requiredStateBlade.func_77977_a())) { + NBTTagCompound reqTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(this.requiredStateBlade); + NBTTagCompound srcTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(curIs); + if (!curIs.getUnlocalizedName().equals(this.requiredStateBlade.getUnlocalizedName())) { return false; } - if (0 < this.tagValueCompare((TagPropertyAccessor)ItemSlashBlade.ProudSoul, reqTag, srcTag)) { + if (0 < this.tagValueCompare(ItemSlashBlade.ProudSoul, reqTag, srcTag)) { return false; } - if (0 < this.tagValueCompare((TagPropertyAccessor)ItemSlashBlade.KillCount, reqTag, srcTag)) { + if (0 < this.tagValueCompare(ItemSlashBlade.KillCount, reqTag, srcTag)) { return false; } - if (0 < this.tagValueCompare((TagPropertyAccessor)ItemSlashBlade.RepairCount, reqTag, srcTag)) { + if (0 < this.tagValueCompare(ItemSlashBlade.RepairCount, reqTag, srcTag)) { return false; } } else { return false; } - curIs = inv.func_70463_b(1, 2); - if (curIs != null && curIs.func_77973_b() instanceof ItemSlashBlade && curIs.func_77942_o()) { - String name = ItemSlashBladeNamed.CurrentItemName.get(curIs.func_77978_p()); + curIs = inv.getStackInSlot(7); + if (curIs != null && curIs.hasTagCompound()) { + String name = ItemSlashBladeNamed.CurrentItemName.get(curIs.getTagCompound()); return "flammpfeil.slashblade.named.yamato".equals(name); } return false; @@ -85,85 +84,85 @@ extends ShapedOreRecipe { return false; } - public ItemStack func_77572_b(InventoryCrafting var1) { + public ItemStack getCraftingResult(InventoryCrafting var1) { String key; ItemStack tmp; - ItemStack result = super.func_77572_b(var1); - ItemStack curIs = var1.func_70463_b(1, 1); - NBTTagCompound oldTag = curIs.func_77978_p(); - oldTag = (NBTTagCompound)oldTag.func_74737_b(); - NBTTagCompound newTag = ItemSlashBlade.getItemTagCompound((ItemStack)result); - if (ItemSlashBladeNamed.CurrentItemName.exists(newTag) && (tmp = SlashBlade.getCustomBlade((String)(key = ItemSlashBladeNamed.CurrentItemName.get(newTag)))) != null) { + ItemStack result = super.getCraftingResult(var1); + ItemStack curIs = var1.getStackInSlot(4); + NBTTagCompound oldTag = curIs.getTagCompound(); + oldTag = (NBTTagCompound)oldTag.copy(); + NBTTagCompound newTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(result); + if (ItemSlashBladeNamed.CurrentItemName.exists(newTag) && (tmp = (ItemStack)SlashBlade.getCustomBlade(key = ItemSlashBladeNamed.CurrentItemName.get(newTag))) != null) { result = tmp; } - newTag = ItemSlashBlade.getItemTagCompound((ItemStack)result); + newTag = (NBTTagCompound)ItemSlashBlade.getItemTagCompound(result); ItemSlashBlade.KillCount.set(newTag, ItemSlashBlade.KillCount.get(oldTag)); ItemSlashBlade.ProudSoul.set(newTag, ItemSlashBlade.ProudSoul.get(oldTag)); ItemSlashBlade.RepairCount.set(newTag, ItemSlashBlade.RepairCount.get(oldTag)); - if (oldTag.func_74764_b("adjustX")) { - newTag.func_74776_a("adjustX", oldTag.func_74760_g("adjustX")); + if (oldTag.hasKey("adjustX")) { + newTag.setDouble("adjustX", oldTag.getDouble("adjustX")); } - if (oldTag.func_74764_b("adjustY")) { - newTag.func_74776_a("adjustY", oldTag.func_74760_g("adjustY")); + if (oldTag.hasKey("adjustY")) { + newTag.setDouble("adjustY", oldTag.getDouble("adjustY")); } - if (oldTag.func_74764_b("adjustZ")) { - newTag.func_74776_a("adjustZ", oldTag.func_74760_g("adjustZ")); + if (oldTag.hasKey("adjustZ")) { + newTag.setDouble("adjustZ", oldTag.getDouble("adjustZ")); } - Map newItemEnchants = EnchantmentHelper.func_82781_a((ItemStack)result); - Map oldItemEnchants = EnchantmentHelper.func_82781_a((ItemStack)curIs); + Map newItemEnchants = EnchantmentHelper.getEnchantments(result); + Map oldItemEnchants = EnchantmentHelper.getEnchantments(curIs); Iterator iterator = oldItemEnchants.keySet().iterator(); while (iterator.hasNext()) { int enchantIndex = (Integer)iterator.next(); - Enchantment enchantment = Enchantment.field_77331_b[enchantIndex]; + Enchantment enchantment = Enchantment.enchantmentsList[enchantIndex]; int destLevel = newItemEnchants.containsKey(enchantIndex) ? (Integer)newItemEnchants.get(enchantIndex) : 0; int srcLevel = (Integer)oldItemEnchants.get(enchantIndex); srcLevel = Math.max(srcLevel, destLevel); - srcLevel = Math.min(srcLevel, enchantment.func_77325_b()); - boolean canApplyFlag = enchantment.func_92089_a(result); + srcLevel = Math.min(srcLevel, enchantment.getMaxLevel()); + boolean canApplyFlag = enchantment.canApply(result); if (!canApplyFlag) continue; Iterator iterator2 = newItemEnchants.keySet().iterator(); while (iterator2.hasNext()) { int curEnchantIndex = (Integer)iterator2.next(); - if (curEnchantIndex == enchantIndex || enchantment.func_77326_a(Enchantment.field_77331_b[curEnchantIndex])) continue; + if (curEnchantIndex == enchantIndex || enchantment.canApplyTogether(Enchantment.enchantmentsList[curEnchantIndex])) continue; canApplyFlag = false; break; } if (!canApplyFlag) continue; newItemEnchants.put(enchantIndex, srcLevel); } - EnchantmentHelper.func_82782_a((Map)newItemEnchants, (ItemStack)result); + EnchantmentHelper.setEnchantments(newItemEnchants, result); return result; } @SubscribeEvent public void itemCraftedEvent(PlayerEvent.ItemCraftedEvent event) { - if (!(event.crafting.func_77973_b() instanceof ItemSlashBladeNamed)) { + if (!(event.crafting.getItem() instanceof net.minecraft.item.Item)) { return; } - if (!event.crafting.func_77942_o()) { + if (!event.crafting.hasTagCompound()) { return; } - if (!"flammpfeil.slashblade.named.nihilul".equalsIgnoreCase(ItemSlashBladeNamed.CurrentItemName.get(event.crafting.func_77978_p()))) { + if (!"flammpfeil.slashblade.named.nihilul".equalsIgnoreCase(ItemSlashBladeNamed.CurrentItemName.get(event.crafting.getTagCompound()))) { return; } if (!(event.craftMatrix instanceof InventoryCrafting)) { return; } - ItemStack yamato = ((InventoryCrafting)event.craftMatrix).func_70463_b(1, 2); + ItemStack yamato = event.craftMatrix.getStackInSlot(7); if (yamato == null) { return; } - if (!(yamato.func_77973_b() instanceof ItemSlashBladeNamed)) { + if (!(yamato.getItem() instanceof net.minecraft.item.Item)) { return; } - if (!yamato.func_77942_o()) { + if (!yamato.hasTagCompound()) { return; } - if (!"flammpfeil.slashblade.named.yamato".equalsIgnoreCase(ItemSlashBladeNamed.CurrentItemName.get(yamato.func_77978_p()))) { + if (!"flammpfeil.slashblade.named.yamato".equalsIgnoreCase(ItemSlashBladeNamed.CurrentItemName.get(yamato.getTagCompound()))) { return; } - if (!event.player.field_71071_by.func_70441_a(yamato = yamato.func_77946_l())) { - event.player.func_71019_a(yamato, false); + if (!event.player.inventory.addItemStackToInventory(yamato = yamato.copy())) { + event.player.dropPlayerItemWithRandomChoice(yamato, false); } } }