Merge pull request #18 from GTNewHorizons/fix-nei-tooltip-crash

Fix Ritual Stone NEI tooltip crash
GTNewHorizons · Jun 18, 2023 · e706221 · e706221
2 parents 7ff9722 + 138b280
commit e706221
Show file tree

Hide file tree

Showing 65 changed files with 533 additions and 304 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,18 +1,18 @@
 // Add your dependencies here
 
 dependencies {
-    compile 'com.github.GTNewHorizons:NotEnoughItems:2.3.21-GTNH:dev'
-    compile 'com.github.GTNewHorizons:ForgeMultipart:1.3.1:dev'
-    compile 'com.github.GTNewHorizons:waila:1.5.22:dev'
-    compile 'com.github.GTNewHorizons:Baubles:1.0.1.14:dev'
-    compile 'com.github.GTNewHorizons:Mantle:0.3.5:dev'
-    compile 'com.github.GTNewHorizons:BloodMagic:1.3.22:dev'
-    compile('com.github.GTNewHorizons:TinkersConstruct:1.9.12-GTNH:dev') {
+    compile 'com.github.GTNewHorizons:NotEnoughItems:2.3.54-GTNH:dev'
+    compile 'com.github.GTNewHorizons:ForgeMultipart:1.3.3:dev'
+    compile 'com.github.GTNewHorizons:waila:1.6.0:dev'
+    compile 'com.github.GTNewHorizons:Baubles:1.0.1.16:dev'
+    compile 'com.github.GTNewHorizons:Mantle:0.3.7:dev'
+    compile 'com.github.GTNewHorizons:BloodMagic:1.4.1:dev'
+    compile('com.github.GTNewHorizons:TinkersConstruct:1.9.36-GTNH:dev') {
         transitive = false
     }
     compile 'com.github.GTNewHorizons:Guide-API:1.0.2:dev'
     compile 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev'
-    compileOnly('com.github.GTNewHorizons:AppleCore:3.2.5:dev') {
+    compileOnly('com.github.GTNewHorizons:AppleCore:3.2.10:dev') {
         transitive = false
     }
 }
diff --git a/src/main/java/com/arc/bloodarsenal/client/renderer/block/TileLifeInfuserRenderer.java b/src/main/java/com/arc/bloodarsenal/client/renderer/block/TileLifeInfuserRenderer.java
@@ -15,6 +15,7 @@
 
 import com.arc.bloodarsenal.client.renderer.model.ModelLifeInfuser;
 import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
+
 import cpw.mods.fml.client.FMLClientHandler;
 
 public class TileLifeInfuserRenderer extends TileEntitySpecialRenderer {

diff --git a/...n/java/com/arc/bloodarsenal/client/renderer/block/item/TilePortableAltarItemRenderer.java b/...n/java/com/arc/bloodarsenal/client/renderer/block/item/TilePortableAltarItemRenderer.java
@@ -8,6 +8,7 @@
 import org.lwjgl.opengl.GL11;
 
 import com.arc.bloodarsenal.client.renderer.model.ModelPortableBloodAltar;
+
 import cpw.mods.fml.client.FMLClientHandler;
 
 public class TilePortableAltarItemRenderer implements IItemRenderer {

diff --git a/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelLifeInfuser.java
@@ -8,6 +8,7 @@
 import org.lwjgl.opengl.GL11;
 
 import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
+
 import cpw.mods.fml.client.FMLClientHandler;
 
 /**

diff --git a/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelPortableBloodAltar.java b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelPortableBloodAltar.java
@@ -10,9 +10,9 @@
 
 import org.lwjgl.opengl.GL11;
 
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
 import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
+
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.client.FMLClientHandler;
 
 public class ModelPortableBloodAltar extends ModelBase {

diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java
@@ -19,11 +19,10 @@
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.world.BlockEvent;
 
-import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
-
 import com.arc.bloodarsenal.common.items.ModItems;
 import com.arc.bloodarsenal.common.items.armor.GlassArmor;
 
+import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
 import cpw.mods.fml.client.event.ConfigChangedEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;

diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java
@@ -8,13 +8,13 @@
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
+import com.arc.bloodarsenal.common.block.ModBlocks;
+import com.arc.bloodarsenal.common.items.ModItems;
+
 import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
 import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
 import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe;
 
-import com.arc.bloodarsenal.common.block.ModBlocks;
-import com.arc.bloodarsenal.common.items.ModItems;
-
 public class BloodArsenalRecipes {
 
     public static void registerAltarRecipes() {

diff --git a/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java b/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java
@@ -4,6 +4,7 @@
 
 import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
 import com.arc.bloodarsenal.common.tinkers.IClientCode;
+
 import cpw.mods.fml.common.registry.EntityRegistry;
 
 public class CommonProxy {

diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java
@@ -12,17 +12,16 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import squeek.applecore.api.food.FoodValues;
-import squeek.applecore.api.food.IEdibleBlock;
-import squeek.applecore.api.food.ItemFoodProxy;
-import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
-
 import com.arc.bloodarsenal.common.BloodArsenalConfig;
 
+import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import squeek.applecore.api.food.FoodValues;
+import squeek.applecore.api.food.IEdibleBlock;
+import squeek.applecore.api.food.ItemFoodProxy;
 
 @Optional.Interface(iface = "squeek.applecore.api.food.IEdibleBlock", modid = "AppleCore")
 public class BlockBloodCake extends Block implements IEdibleBlock {

diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompactedMRS.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompactedMRS.java
@@ -16,12 +16,11 @@
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 
+import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS;
+
 import WayofTime.alchemicalWizardry.api.rituals.Rituals;
 import WayofTime.alchemicalWizardry.common.block.BlockMasterStone;
 import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
-
-import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java
@@ -17,6 +17,10 @@
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 
+import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS;
+import com.arc.bloodarsenal.common.tileentity.TileCompacter;
+import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
+
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
 import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
 import WayofTime.alchemicalWizardry.api.rituals.Rituals;
@@ -28,11 +32,6 @@
 import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-
-import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS;
-import com.arc.bloodarsenal.common.tileentity.TileCompacter;
-import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java
@@ -18,12 +18,11 @@
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 
+import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer;
+
 import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
 import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding;
-
-import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java
@@ -15,11 +15,11 @@
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 
+import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
+
 import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding;
 
-import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
-
 public class BlockLifeInfuser extends BlockContainer {
 
     public BlockLifeInfuser() {

diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java
@@ -19,13 +19,12 @@
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
+import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
+
 import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
 import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
 import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding;
-
-import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java b/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java
@@ -11,6 +11,7 @@
 import com.arc.bloodarsenal.common.items.block.CompactedMRSBlock;
 import com.arc.bloodarsenal.common.items.block.PortableAltarBlock;
 import com.arc.bloodarsenal.common.tileentity.*;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ModBlocks {

diff --git a/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java
@@ -10,6 +10,7 @@
 import net.minecraftforge.common.config.ConfigElement;
 
 import com.arc.bloodarsenal.common.BloodArsenal;
+
 import cpw.mods.fml.client.config.*;
 
 public class ConfigGui extends GuiConfig {

diff --git a/src/main/java/com/arc/bloodarsenal/common/gui/GuiHandler.java b/src/main/java/com/arc/bloodarsenal/common/gui/GuiHandler.java
@@ -6,6 +6,7 @@
 import com.arc.bloodarsenal.common.items.sigil.holding.ContainerAugmentedHolding;
 import com.arc.bloodarsenal.common.items.sigil.holding.GuiAugmentedHolding;
 import com.arc.bloodarsenal.common.items.sigil.holding.InventoryAugmentedHolding;
+
 import cpw.mods.fml.common.network.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java
@@ -13,12 +13,11 @@
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import com.arc.bloodarsenal.common.BloodArsenal;
+
 import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
 import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-
-import com.arc.bloodarsenal.common.BloodArsenal;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulBooster.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulBooster.java
@@ -12,11 +12,11 @@
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import com.arc.bloodarsenal.common.BloodArsenal;
+
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
 
-import com.arc.bloodarsenal.common.BloodArsenal;
-
 public class ItemSoulBooster extends Item implements IBindable {
 
     public ItemSoulBooster() {

diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulNullifier.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulNullifier.java
@@ -13,10 +13,10 @@
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import com.arc.bloodarsenal.common.BloodArsenal;
+
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
-
-import com.arc.bloodarsenal.common.BloodArsenal;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 
 public class ItemSoulNullifier extends Item implements IBindable {

diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java b/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java
@@ -8,12 +8,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.wands.StaffRod;
-import thaumcraft.api.wands.WandCap;
-import thaumcraft.api.wands.WandRod;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
 import com.arc.bloodarsenal.common.BloodArsenal;
 import com.arc.bloodarsenal.common.BloodArsenalConfig;
 import com.arc.bloodarsenal.common.block.ModBlocks;
@@ -27,8 +21,13 @@
 import com.arc.bloodarsenal.common.items.tool.*;
 import com.arc.bloodarsenal.common.thaumcraft.*;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.wands.StaffRod;
+import thaumcraft.api.wands.WandCap;
+import thaumcraft.api.wands.WandRod;
 
 public class ModItems {
 

diff --git a/src/main/java/com/arc/bloodarsenal/common/items/armor/ElementalLifeImbuedArmor.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/ElementalLifeImbuedArmor.java
@@ -21,12 +21,12 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
 
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
 import com.arc.bloodarsenal.common.BloodArsenal;
 import com.arc.bloodarsenal.common.items.ModItems;
 import com.arc.bloodarsenal.common.items.tool.IFillable;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
 public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillable {
 
     private final int maxLP = 100000;

diff --git a/src/main/java/com/arc/bloodarsenal/common/items/armor/LifeImbuedArmor.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/LifeImbuedArmor.java
@@ -21,12 +21,12 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
 
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
 import com.arc.bloodarsenal.common.BloodArsenal;
 import com.arc.bloodarsenal.common.items.ModItems;
 import com.arc.bloodarsenal.common.items.tool.IFillable;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
 public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillable {
 
     private int maxLP = 100000;

diff --git a/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSacrificeAmulet.java
@@ -18,6 +18,9 @@
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 
+import com.arc.bloodarsenal.common.BloodArsenalConfig;
+import com.arc.bloodarsenal.common.items.ModItems;
+
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
 import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
@@ -27,10 +30,6 @@
 import baubles.api.IBauble;
 import baubles.common.container.InventoryBaubles;
 import baubles.common.lib.PlayerHandler;
-
-import com.arc.bloodarsenal.common.BloodArsenalConfig;
-import com.arc.bloodarsenal.common.items.ModItems;
-
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

diff --git a/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSelfSacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSelfSacrificeAmulet.java
@@ -19,6 +19,9 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 
+import com.arc.bloodarsenal.common.BloodArsenalConfig;
+import com.arc.bloodarsenal.common.items.ModItems;
+
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
 import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
@@ -28,10 +31,6 @@
 import baubles.api.IBauble;
 import baubles.common.container.InventoryBaubles;
 import baubles.common.lib.PlayerHandler;
-
-import com.arc.bloodarsenal.common.BloodArsenalConfig;
-import com.arc.bloodarsenal.common.items.ModItems;
-
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

diff --git a/src/main/java/com/arc/bloodarsenal/common/items/bauble/SacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/SacrificeAmulet.java
@@ -18,16 +18,15 @@
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 
+import com.arc.bloodarsenal.common.BloodArsenalConfig;
+import com.arc.bloodarsenal.common.items.ModItems;
+
 import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
 import baubles.api.BaubleType;
 import baubles.api.IBauble;
 import baubles.common.container.InventoryBaubles;
 import baubles.common.lib.PlayerHandler;
-
-import com.arc.bloodarsenal.common.BloodArsenalConfig;
-import com.arc.bloodarsenal.common.items.ModItems;
-
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     import org.lwjgl.opengl.GL11;
     import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
     import cpw.mods.fml.client.FMLClientHandler;
     /**
@@ Expand Down @@