Merge pull request #37 from UltraHex/pull-request/optifine

Fix Universium rendering with OptiFine

dependencies.gradle

@@ -1,30 +1,30 @@
 // Add your dependencies here
 
 dependencies {
-    devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev")
 
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.6.7:api") {
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.8.1:api") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Botania:1.9.22-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Mantle:0.3.6:dev") {
+    compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.32-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.13-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.1:dev") {
+    compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.12:dev") {
+    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.13:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.2.13:dev") {
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.5:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.43.39:dev") {
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.15:dev") {
         transitive = false
     }
 
@@ -40,4 +40,6 @@ dependencies {
     compileOnly("curse.maven:witchery-69673:2234410") {
         transitive = false
     }
+
+    runtimeOnly("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-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

src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java

@@ -3,7 +3,13 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IBeeMutation;
+import forestry.api.apiculture.IBeeRoot;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleSpecies;
 

src/main/java/fox/spiteful/avaritia/compat/forestry/GreedyBeeSpecies.java

@@ -1,7 +1,11 @@
 package fox.spiteful.avaritia.compat.forestry;
 
-import java.awt.*;
-import java.util.*;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
@@ -14,11 +18,21 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.EnumBeeChromosome;
+import forestry.api.apiculture.EnumBeeType;
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeRoot;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
 import forestry.api.core.IIconProvider;
-import forestry.api.genetics.*;
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IClassification;
+import forestry.api.genetics.IIndividual;
+import forestry.api.genetics.IMutation;
 import fox.spiteful.avaritia.items.LudicrousItems;
 
 public enum GreedyBeeSpecies implements IAlleleBeeSpecies, IIconProvider {

src/main/java/fox/spiteful/avaritia/compat/forestry/ItemComb.java

@@ -1,7 +1,6 @@
 package fox.spiteful.avaritia.compat.forestry;
 
-import java.awt.*;
-import java.util.*;
+import java.awt.Color;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;

src/main/java/fox/spiteful/avaritia/compat/nei/CompressionHandler.java

@@ -1,7 +1,8 @@
 package fox.spiteful.avaritia.compat.nei;
 
-import java.awt.*;
-import java.util.*;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.client.Minecraft;

src/main/java/fox/spiteful/avaritia/compat/nei/ExtremeShapedRecipeHandler.java

@@ -1,6 +1,6 @@
 package fox.spiteful.avaritia.compat.nei;
 
-import java.awt.*;
+import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/fox/spiteful/avaritia/compat/nei/ExtremeShapelessRecipeHandler.java

@@ -1,6 +1,6 @@
 package fox.spiteful.avaritia.compat.nei;
 
-import java.awt.*;
+import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

src/main/java/fox/spiteful/avaritia/compat/ticon/TConTextureResourcePackBase.java

@@ -17,7 +17,11 @@
 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;

src/main/java/fox/spiteful/avaritia/crafting/ExtremeCraftingManager.java

@@ -1,12 +1,14 @@
 package fox.spiteful.avaritia.crafting;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 import net.minecraft.block.Block;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.*;
+import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 

src/main/java/fox/spiteful/avaritia/crafting/Mincer.java

@@ -1,6 +1,10 @@
 package fox.spiteful.avaritia.crafting;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Random;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;

src/main/java/fox/spiteful/avaritia/gui/ContainerExtremeCrafting.java

@@ -2,7 +2,11 @@
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.*;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.inventory.Slot;
+import net.minecraft.inventory.SlotCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 

src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java

@@ -12,7 +12,12 @@
 import cpw.mods.fml.common.registry.GameRegistry;
 import fox.spiteful.avaritia.Avaritia;
 import fox.spiteful.avaritia.Config;
-import fox.spiteful.avaritia.items.tools.*;
+import fox.spiteful.avaritia.items.tools.ItemAxeInfinity;
+import fox.spiteful.avaritia.items.tools.ItemBowInfinity;
+import fox.spiteful.avaritia.items.tools.ItemPickaxeInfinity;
+import fox.spiteful.avaritia.items.tools.ItemShovelInfinity;
+import fox.spiteful.avaritia.items.tools.ItemSwordInfinity;
+import fox.spiteful.avaritia.items.tools.ItemSwordSkulls;
 
 public class LudicrousItems {
 

src/main/java/fox/spiteful/avaritia/items/tools/ToolHelper.java

@@ -7,8 +7,15 @@
 
 package fox.spiteful.avaritia.items.tools;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import java.util.WeakHashMap;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;

src/main/resources/assets/avaritia/shader/cosmic.frag

@@ -174,7 +174,7 @@ void main (void)
     col.rgb *= shade;
 
     // apply mask
-    col.a *= mask.r * opacity;
+    col.a *= mask.a * opacity;
 
 	col = clamp(col,0.0,1.0);