Merge pull request #20 from Quetz4l/master

Buff daggers and replace wildcard imports

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

repositories.gradle

@@ -1,21 +0,0 @@
-// Add any additional repositories for your dependencies here
-
-repositories {
-    mavenCentral ()
-    maven {
-        name = "GTNH Maven"
-        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-    }
-    maven {
-        name = "ic2"
-        url = "https://maven.ic2.player.to/"
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        name = "jitpack"
-        url = "https://jitpack.io"
-    }
-}

src/main/java/com/arc/bloodarsenal/client/ClientProxy.java

@@ -6,7 +6,9 @@
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.MinecraftForge;
 
-import com.arc.bloodarsenal.client.renderer.block.*;
+import com.arc.bloodarsenal.client.renderer.block.RenderBloodTNTPrimed;
+import com.arc.bloodarsenal.client.renderer.block.RenderTileLifeInfuser;
+import com.arc.bloodarsenal.client.renderer.block.TileLifeInfuserRenderer;
 import com.arc.bloodarsenal.client.renderer.block.TilePortableAltarRenderer;
 import com.arc.bloodarsenal.client.renderer.block.item.TilePortableAltarItemRenderer;
 import com.arc.bloodarsenal.client.renderer.item.RenderBow;

src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java

@@ -31,7 +31,10 @@
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.*;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 
 @Mod(

src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java

@@ -8,7 +8,11 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.*;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 

src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java

@@ -10,7 +10,11 @@
 import com.arc.bloodarsenal.common.items.block.BloodStoneBlock;
 import com.arc.bloodarsenal.common.items.block.CompactedMRSBlock;
 import com.arc.bloodarsenal.common.items.block.PortableAltarBlock;
-import com.arc.bloodarsenal.common.tileentity.*;
+import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS;
+import com.arc.bloodarsenal.common.tileentity.TileCompacter;
+import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer;
+import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser;
+import com.arc.bloodarsenal.common.tileentity.TilePortableAltar;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 

src/main/java/com/arc/bloodarsenal/common/entity/mob/EntityBloodHound.java

@@ -6,7 +6,14 @@
 import net.minecraft.entity.EntityAgeable;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.ai.*;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAIFollowOwner;
+import net.minecraft.entity.ai.EntityAIHurtByTarget;
+import net.minecraft.entity.ai.EntityAILeapAtTarget;
+import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
+import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
+import net.minecraft.entity.ai.EntityAISwimming;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.EntityGhast;
 import net.minecraft.entity.passive.EntityHorse;

src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java

@@ -11,7 +11,8 @@
 
 import com.arc.bloodarsenal.common.BloodArsenal;
 
-import cpw.mods.fml.client.config.*;
+import cpw.mods.fml.client.config.GuiConfig;
+import cpw.mods.fml.client.config.IConfigElement;
 
 public class ConfigGui extends GuiConfig {
 

src/main/java/com/arc/bloodarsenal/common/items/ModItems.java

@@ -14,12 +14,41 @@
 import com.arc.bloodarsenal.common.items.armor.GlassArmor;
 import com.arc.bloodarsenal.common.items.armor.LifeImbuedArmor;
 import com.arc.bloodarsenal.common.items.armor.VampireCostume;
-import com.arc.bloodarsenal.common.items.bauble.*;
+import com.arc.bloodarsenal.common.items.bauble.EmpoweredSacrificeAmulet;
+import com.arc.bloodarsenal.common.items.bauble.EmpoweredSelfSacrificeAmulet;
+import com.arc.bloodarsenal.common.items.bauble.SacrificeAmulet;
+import com.arc.bloodarsenal.common.items.bauble.SelfSacrificeAmulet;
+import com.arc.bloodarsenal.common.items.bauble.VampireRing;
 import com.arc.bloodarsenal.common.items.orb.TransparentOrb;
-import com.arc.bloodarsenal.common.items.sigil.*;
+import com.arc.bloodarsenal.common.items.sigil.SigilDivinity;
+import com.arc.bloodarsenal.common.items.sigil.SigilEnder;
+import com.arc.bloodarsenal.common.items.sigil.SigilLightning;
+import com.arc.bloodarsenal.common.items.sigil.SigilSwimming;
 import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding;
-import com.arc.bloodarsenal.common.items.tool.*;
-import com.arc.bloodarsenal.common.thaumcraft.*;
+import com.arc.bloodarsenal.common.items.tool.BoundBow;
+import com.arc.bloodarsenal.common.items.tool.BoundIgniter;
+import com.arc.bloodarsenal.common.items.tool.BoundShears;
+import com.arc.bloodarsenal.common.items.tool.BoundSickle;
+import com.arc.bloodarsenal.common.items.tool.GlassDaggerOfSacrifice;
+import com.arc.bloodarsenal.common.items.tool.GlassSacrificialDagger;
+import com.arc.bloodarsenal.common.items.tool.InfusedDiamond;
+import com.arc.bloodarsenal.common.items.tool.InfusedDiamondAxe;
+import com.arc.bloodarsenal.common.items.tool.InfusedDiamondPickaxe;
+import com.arc.bloodarsenal.common.items.tool.InfusedDiamondShovel;
+import com.arc.bloodarsenal.common.items.tool.InfusedDiamondSword;
+import com.arc.bloodarsenal.common.items.tool.InfusedIronAxe;
+import com.arc.bloodarsenal.common.items.tool.InfusedIronPickaxe;
+import com.arc.bloodarsenal.common.items.tool.InfusedIronShovel;
+import com.arc.bloodarsenal.common.items.tool.InfusedIronSword;
+import com.arc.bloodarsenal.common.items.tool.InfusedWoodAxe;
+import com.arc.bloodarsenal.common.items.tool.InfusedWoodPickaxe;
+import com.arc.bloodarsenal.common.items.tool.InfusedWoodShovel;
+import com.arc.bloodarsenal.common.items.tool.InfusedWoodSword;
+import com.arc.bloodarsenal.common.thaumcraft.BloodWoodStaffUpdate;
+import com.arc.bloodarsenal.common.thaumcraft.BloodWoodWandUpdate;
+import com.arc.bloodarsenal.common.thaumcraft.BloodyWandCap;
+import com.arc.bloodarsenal.common.thaumcraft.ItemWandCaps;
+import com.arc.bloodarsenal.common.thaumcraft.ItemWandCores;
 
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.common.Optional;

src/main/java/com/arc/bloodarsenal/common/items/tool/GlassDaggerOfSacrifice.java

@@ -1,17 +1,13 @@
 package com.arc.bloodarsenal.common.items.tool;
 
 import java.util.List;
-import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.boss.IBossDisplayData;
-import net.minecraft.entity.monster.EntityEnderman;
-import net.minecraft.entity.monster.EntitySlime;
-import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -25,6 +21,7 @@
 import com.arc.bloodarsenal.common.BloodArsenalConfig;
 import com.google.common.collect.Multimap;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
 import WayofTime.alchemicalWizardry.common.IDemon;
 import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon;
@@ -74,14 +71,18 @@ public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLiv
             this.findAndNotifyAltarOfDemon(world, par2EntityLivingBase);
         }
 
-        int lifeEssence = 500;
-        Random random = new Random();
+        int lifeEssence = AlchemicalWizardry.lpPerSactificeCustom.containsKey(par2EntityLivingBase.getClass())
+                ? AlchemicalWizardry.lpPerSactificeCustom.get(par2EntityLivingBase.getClass())
+                : AlchemicalWizardry.lpPerSacrificeBase;
 
-        if (random.nextInt(3) == 2) lifeEssence = 100;
-        else if (par2EntityLivingBase instanceof EntityVillager) lifeEssence = 2500;
-        else if (par2EntityLivingBase instanceof EntitySlime) lifeEssence = 200;
-        else if (par2EntityLivingBase instanceof EntityEnderman) lifeEssence = 300;
-        else if (par2EntityLivingBase instanceof EntityAnimal) lifeEssence = 350;
+        if (par2EntityLivingBase instanceof EntityVillager) {
+            lifeEssence += 500;
+        } else {
+            lifeEssence += 100;
+        }
+
+        int criticalHit = world.rand.nextInt(9);
+        if ((par2EntityLivingBase instanceof EntityVillager && criticalHit <= 2) || criticalHit <= 1) lifeEssence *= 5;
 
         if (findAndFillAltar(par2EntityLivingBase.worldObj, par2EntityLivingBase, lifeEssence)) {
             double posX = par2EntityLivingBase.posX;

src/main/java/com/arc/bloodarsenal/common/items/tool/GlassSacrificialDagger.java

@@ -1,7 +1,6 @@
 package com.arc.bloodarsenal.common.items.tool;
 
 import java.util.List;
-import java.util.Random;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -106,19 +105,21 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla
             return stack;
         }
 
+        int lifeEssence = 500;
+        if (world.rand.nextInt(9) <= 1) lifeEssence *= 2;
+
         if (player.isPotionActive(AlchemicalWizardry.customPotionSoulFray)) {
-            findAndFillAltar(world, player, 50);
+            findAndFillAltar(world, player, lifeEssence / 10);
         } else {
-            findAndFillAltar(world, player, 500);
+            findAndFillAltar(world, player, lifeEssence);
         }
 
         if (player.getHealth() <= 0.001f) {
             player.onDeath(BloodArsenal.deathFromBlood);
         }
 
-        Random random = new Random();
-        if (random.nextInt(4) < 1) {
-            player.addPotionEffect(new PotionEffect(BloodArsenalConfig.bleedingID, random.nextInt(5) * 20, 0));
+        if (world.rand.nextInt(4) < 1) {
+            player.addPotionEffect(new PotionEffect(BloodArsenalConfig.bleedingID, world.rand.nextInt(5) * 20, 0));
         }
         return stack;
     }

src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java

@@ -19,7 +19,11 @@
 import net.minecraftforge.common.util.ForgeDirection;
 
 import WayofTime.alchemicalWizardry.api.Int3;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.*;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainer;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack;
 import WayofTime.alchemicalWizardry.api.event.RitualActivatedEvent;
 import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
 import WayofTime.alchemicalWizardry.api.rituals.LocalRitualStorage;

src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java

@@ -12,7 +12,14 @@
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.*;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidEvent;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.IFluidTank;
 
 import com.arc.bloodarsenal.common.BloodArsenalConfig;
 

src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java

@@ -12,7 +12,14 @@
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.*;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidEvent;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.IFluidTank;
 
 import com.arc.bloodarsenal.common.items.tool.IFillable;
 

src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java

@@ -17,7 +17,14 @@
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.*;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidEvent;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.IFluidTank;
 
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe;

src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java

@@ -6,12 +6,20 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 
 import javax.imageio.ImageIO;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.*;
+import net.minecraft.client.resources.IReloadableResourceManager;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.resources.ResourcePackRepository;
 import net.minecraft.client.resources.data.IMetadataSection;
 import net.minecraft.client.resources.data.IMetadataSerializer;
 import net.minecraft.util.ResourceLocation;