Small fixes.

MartinSVK12 · Jan 13, 2025 · e128698 · e128698
1 parent 8ffd678
commit e128698
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -255,6 +255,7 @@ allprojects {
 							artifactId = project.mod_name
 							version = project.mod_version
 							from components.java
+							println("Version ${project.mod_version} of ${project.mod_group}.${project.mod_name} ready for release!")
 						}
 					}
 				}
@@ -279,6 +280,7 @@ allprojects {
 							artifactId = project.core_mod_name
 							version = project.core_mod_version
 							from components.java
+							println("Version ${project.core_mod_version} of ${project.core_mod_group}.${project.core_mod_name} ready for release!")
 						}
 					}
 				}

diff --git a/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java b/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java
@@ -758,7 +758,7 @@ public void afterClientStart() {
                 .withComponent(new KeyBindingComponent(((IKeybinds) Minecraft.getMinecraft(Minecraft.class).gameSettings).signalIndustries$getKeyOpenSuit()))
                 .withComponent(new KeyBindingComponent(((IKeybinds) Minecraft.getMinecraft(Minecraft.class).gameSettings).signalIndustries$getKeyActivateAbility()))
                 .withComponent(new KeyBindingComponent(((IKeybinds) Minecraft.getMinecraft(Minecraft.class).gameSettings).signalIndustries$getKeySwitchMode()))
-                .withComponent(new KeyBindingComponent(((IKeybinds) Minecraft.getMinecraft(Minecraft.class).gameSettings).signalindustries$getKeyShowIndex()))
+                //.withComponent(new KeyBindingComponent(((IKeybinds) Minecraft.getMinecraft(Minecraft.class).gameSettings).signalindustries$getKeyShowIndex()))
                 .withComponent(new KeyBindingComponent(((IKeybinds) Minecraft.getMinecraft(Minecraft.class).gameSettings).signalIndustries$getKeyActivateHeadTopAttachment()))
                 .withComponent(new KeyBindingComponent(((IKeybinds) Minecraft.getMinecraft(Minecraft.class).gameSettings).signalIndustries$getKeyActivateHeadLensAttachment()))
                 .withComponent(new KeyBindingComponent(((IKeybinds) Minecraft.getMinecraft(Minecraft.class).gameSettings).signalIndustries$getKeyActivateArmBackLAttachment()))

diff --git a/src/main/java/sunsetsatellite/signalindustries/gui/GuiBackpack.java b/src/main/java/sunsetsatellite/signalindustries/gui/GuiBackpack.java
@@ -34,14 +34,14 @@ public GuiBackpack(InventoryPlayer inventoryPlayer, ItemStack backpack) {
 
     protected void drawGuiContainerBackgroundLayer(float f)
     {
-        int i = mc.renderEngine.getTexture("assets/signalindustries/gui/basic_backpack.png");
+        int i = mc.renderEngine.getTexture("/assets/signalindustries/gui/basic_backpack.png");
         if(backpack.getItem() instanceof ItemBackpackAttachment){
             switch (((ItemBackpackAttachment) backpack.getItem()).tier){
                 case BASIC:
-                    i = mc.renderEngine.getTexture("assets/signalindustries/gui/basic_backpack.png");
+                    i = mc.renderEngine.getTexture("/assets/signalindustries/gui/basic_backpack.png");
                     break;
                 case REINFORCED:
-                    i = mc.renderEngine.getTexture("assets/signalindustries/gui/reinforced_backpack.png");
+                    i = mc.renderEngine.getTexture("/assets/signalindustries/gui/reinforced_backpack.png");
                     break;
             }
         }

diff --git a/src/main/java/sunsetsatellite/signalindustries/gui/GuiBuilder.java b/src/main/java/sunsetsatellite/signalindustries/gui/GuiBuilder.java
@@ -79,7 +79,7 @@ public void mouseClicked(int x, int y, int button) {
             if (y > j + 40 && y < j + 46) {
                 I18n translator = I18n.getInstance();
                 String name = translator.translateKey(tile.getBlockType().getLanguageKey(0)+".name");
-                ////GuidebookPlusPlus.nameFocus = ">"+ name;
+                //GuidebookPlusPlus.nameFocus = ">"+ name;
                 if(entityplayer instanceof EntityPlayerSP){
                     ((EntityPlayerSP)entityplayer).displayGUIGuidebook();
                 } else if (entityplayer instanceof EntityPlayerMP) {

diff --git a/src/main/java/sunsetsatellite/signalindustries/gui/GuiHarness.java b/src/main/java/sunsetsatellite/signalindustries/gui/GuiHarness.java
@@ -23,7 +23,7 @@ public GuiHarness(InventoryPlayer inventoryPlayer, ItemStack armor) {
 
     protected void drawGuiContainerBackgroundLayer(float f)
     {
-        int i = mc.renderEngine.getTexture("assets/signalindustries/gui/harness_ui.png");
+        int i = mc.renderEngine.getTexture("/assets/signalindustries/gui/harness_ui.png");
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
         mc.renderEngine.bindTexture(i);
         int j = (width - xSize) / 2;

diff --git a/src/main/java/sunsetsatellite/signalindustries/gui/GuiPulsar.java b/src/main/java/sunsetsatellite/signalindustries/gui/GuiPulsar.java
@@ -23,7 +23,7 @@ public GuiPulsar(InventoryPlayer inventoryPlayer, ItemStack pulsar) {
 
     protected void drawGuiContainerBackgroundLayer(float f)
     {
-        int i = mc.renderEngine.getTexture("assets/signalindustries/gui/pulsar_ui.png");
+        int i = mc.renderEngine.getTexture("/assets/signalindustries/gui/pulsar_ui.png");
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
         mc.renderEngine.bindTexture(i);
         int j = (width - xSize) / 2;

diff --git a/src/main/java/sunsetsatellite/signalindustries/gui/GuiPulsarAttachment.java b/src/main/java/sunsetsatellite/signalindustries/gui/GuiPulsarAttachment.java
@@ -23,7 +23,7 @@ public GuiPulsarAttachment(InventoryPlayer inventoryPlayer, ItemStack pulsar) {
 
     protected void drawGuiContainerBackgroundLayer(float f)
     {
-        int i = mc.renderEngine.getTexture("assets/signalindustries/gui/pulsar_ui_2.png");
+        int i = mc.renderEngine.getTexture("/assets/signalindustries/gui/pulsar_ui_2.png");
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
         mc.renderEngine.bindTexture(i);
         int j = (width - xSize) / 2;

diff --git a/src/main/java/sunsetsatellite/signalindustries/inventories/TileEntityMultiConduit.java b/src/main/java/sunsetsatellite/signalindustries/inventories/TileEntityMultiConduit.java
@@ -147,7 +147,7 @@ public void tick() {
     public boolean addConduit(IConduitBlock newConduit){
         for (int i = 0; i < conduits.length; i++) {
             IConduitBlock conduit = conduits[i];
-            if(newConduit.getConduitCapability() == ConduitCapability.NETWORK && conduit != null && conduit.getConduitCapability() == ConduitCapability.NETWORK){
+            if(newConduit.getConduitCapability() == ConduitCapability.RES_NETWORK && conduit != null && conduit.getConduitCapability() == ConduitCapability.RES_NETWORK){
                 return false;
             }
             if (conduit == null) {

diff --git a/src/main/java/sunsetsatellite/signalindustries/inventories/TileEntityStorageContainer.java b/src/main/java/sunsetsatellite/signalindustries/inventories/TileEntityStorageContainer.java
@@ -4,6 +4,7 @@
 import net.minecraft.core.entity.player.EntityPlayer;
 import net.minecraft.core.item.ItemStack;
 import net.minecraft.core.player.inventory.IInventory;
+import sunsetsatellite.catalyst.core.util.mixin.interfaces.UnlimitedItemStack;
 import sunsetsatellite.signalindustries.inventories.base.TileEntityTiered;
 import sunsetsatellite.signalindustries.util.Tier;
 
@@ -46,6 +47,7 @@ public void readFromNBT(CompoundTag nbttagcompound) {
         locked = nbttagcompound.getBoolean("Locked");
         if(nbttagcompound.containsKey("Contents")){
             contents = new ItemStack(1,1,0);
+            ((UnlimitedItemStack) (Object) contents).enableCustomMaxSize((int) (4096 * (Math.pow(2, tier.ordinal()))));
             contents.readFromNBT(nbttagcompound.getCompound("Contents"));
             contents.stackSize = nbttagcompound.getCompound("Contents").getInteger("Count");
         }
@@ -156,7 +158,11 @@ public int getSizeInventory() {
 
     @Override
     public ItemStack getStackInSlot(int paramInt) {
-        if (paramInt == 0) return contents;
+        if (paramInt == 0) {
+            if(contents == null) return null;
+            ((UnlimitedItemStack)(Object) contents).enableCustomMaxSize((int) (4096 * (Math.pow(2, tier.ordinal()))));
+            return contents;
+        }
         return null;
     }
 

diff --git a/src/main/java/sunsetsatellite/signalindustries/items/models/ItemModelBlockSIFluidTank.java b/src/main/java/sunsetsatellite/signalindustries/items/models/ItemModelBlockSIFluidTank.java
@@ -16,7 +16,7 @@
 import sunsetsatellite.catalyst.Catalyst;
 import sunsetsatellite.catalyst.core.util.BlockInstance;
 import sunsetsatellite.catalyst.core.util.Vec3i;
-import sunsetsatellite.catalyst.multiblocks.HologramWorld;
+import sunsetsatellite.catalyst.core.util.HologramWorld;
 
 import java.util.ArrayList;
 

diff --git a/src/main/java/sunsetsatellite/signalindustries/mixin/RenderGlobalMixin.java b/src/main/java/sunsetsatellite/signalindustries/mixin/RenderGlobalMixin.java
@@ -23,7 +23,7 @@
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 import sunsetsatellite.catalyst.core.util.BlockInstance;
 import sunsetsatellite.catalyst.core.util.IFullbright;
-import sunsetsatellite.catalyst.multiblocks.HologramWorld;
+import sunsetsatellite.catalyst.core.util.HologramWorld;
 import sunsetsatellite.signalindustries.SIDimensions;
 import sunsetsatellite.signalindustries.SIItems;
 import sunsetsatellite.signalindustries.SIWeather;

diff --git a/src/main/java/sunsetsatellite/signalindustries/render/RenderBuilderPreview.java b/src/main/java/sunsetsatellite/signalindustries/render/RenderBuilderPreview.java
@@ -12,7 +12,7 @@
 import net.minecraft.core.world.World;
 import org.lwjgl.opengl.GL11;
 import sunsetsatellite.catalyst.core.util.*;
-import sunsetsatellite.catalyst.multiblocks.HologramWorld;
+import sunsetsatellite.catalyst.core.util.HologramWorld;
 import sunsetsatellite.signalindustries.inventories.machines.TileEntityBuilder;
 import sunsetsatellite.signalindustries.items.ItemBlueprint;
 import sunsetsatellite.signalindustries.util.SIMultiblock;

diff --git a/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInBlock.java b/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInBlock.java
@@ -15,7 +15,7 @@
 import sunsetsatellite.catalyst.core.util.IColorOverride;
 import sunsetsatellite.catalyst.core.util.Vec3i;
 import sunsetsatellite.catalyst.fluids.impl.tiles.TileEntityFluidContainer;
-import sunsetsatellite.catalyst.multiblocks.HologramWorld;
+import sunsetsatellite.catalyst.core.util.HologramWorld;
 
 import java.util.ArrayList;
 

diff --git a/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInConduit.java b/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInConduit.java
@@ -21,7 +21,7 @@
 import sunsetsatellite.catalyst.core.util.Vec3i;
 import sunsetsatellite.catalyst.fluids.api.IFluidInventory;
 import sunsetsatellite.catalyst.fluids.impl.tiles.TileEntityFluidContainer;
-import sunsetsatellite.catalyst.multiblocks.HologramWorld;
+import sunsetsatellite.catalyst.core.util.HologramWorld;
 import sunsetsatellite.signalindustries.SIBlocks;
 import sunsetsatellite.signalindustries.SignalIndustries;
 import sunsetsatellite.signalindustries.blocks.BlockConduit;

diff --git a/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInMultiConduit.java b/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInMultiConduit.java
@@ -13,7 +13,7 @@
 import sunsetsatellite.catalyst.CatalystFluids;
 import sunsetsatellite.catalyst.core.util.*;
 import sunsetsatellite.catalyst.fluids.util.FluidStack;
-import sunsetsatellite.catalyst.multiblocks.HologramWorld;
+import sunsetsatellite.catalyst.core.util.HologramWorld;
 import sunsetsatellite.signalindustries.blocks.BlockMultiConduit;
 import sunsetsatellite.catalyst.core.util.IConduitBlock;
 import sunsetsatellite.signalindustries.inventories.TileEntityMultiConduit;

diff --git a/src/main/java/sunsetsatellite/signalindustries/render/RenderMultiFluidInBlock.java b/src/main/java/sunsetsatellite/signalindustries/render/RenderMultiFluidInBlock.java
@@ -13,7 +13,7 @@
 import sunsetsatellite.catalyst.core.util.IColorOverride;
 import sunsetsatellite.catalyst.core.util.Vec3i;
 import sunsetsatellite.catalyst.fluids.util.FluidStack;
-import sunsetsatellite.catalyst.multiblocks.HologramWorld;
+import sunsetsatellite.catalyst.core.util.HologramWorld;
 import sunsetsatellite.signalindustries.inventories.base.TileEntityTieredMachineSimple;
 
 import java.util.ArrayList;

diff --git a/src/main/java/sunsetsatellite/signalindustries/render/RenderMultiblockInGuidebook.java b/src/main/java/sunsetsatellite/signalindustries/render/RenderMultiblockInGuidebook.java
@@ -9,7 +9,7 @@
 import net.minecraft.client.render.tessellator.Tessellator;
 import org.lwjgl.opengl.GL11;
 import sunsetsatellite.catalyst.core.util.*;
-import sunsetsatellite.catalyst.multiblocks.HologramWorld;
+import sunsetsatellite.catalyst.core.util.HologramWorld;
 import sunsetsatellite.catalyst.multiblocks.Multiblock;
 
 import java.util.ArrayList;

diff --git a/src/main/java/sunsetsatellite/signalindustries/render/RenderStoneworks.java b/src/main/java/sunsetsatellite/signalindustries/render/RenderStoneworks.java
@@ -13,7 +13,7 @@
 import sunsetsatellite.catalyst.core.util.IColorOverride;
 import sunsetsatellite.catalyst.core.util.Vec3i;
 import sunsetsatellite.catalyst.fluids.util.FluidStack;
-import sunsetsatellite.catalyst.multiblocks.HologramWorld;
+import sunsetsatellite.catalyst.core.util.HologramWorld;
 import sunsetsatellite.signalindustries.inventories.base.TileEntityTieredMachineSimple;
 
 import java.util.ArrayList;

diff --git a/src/main/java/sunsetsatellite/signalindustries/util/IndexRenderer.java b/src/main/java/sunsetsatellite/signalindustries/util/IndexRenderer.java
@@ -41,7 +41,7 @@ public class IndexRenderer {
     public static HashMap<IdMetaPair,ItemStack> items = new HashMap<>();
     private static HashSet<Map.Entry<IdMetaPair, ItemStack>> sortedEntries;
     private static boolean initialized = false;
-    public static boolean show = true;
+    public static boolean show = false;
 
     public static void init() {
         for (ItemStack stack : ContainerPlayerCreative.creativeItems) {
@@ -236,7 +236,7 @@ public static void drawScreen(Minecraft mc, int mouseX, int mouseY, int width, i
     public static void keyTyped(char c, int i, int mouseX, int mouseY) {
         KeyBinding showIndexKey = ((IKeybinds) Minecraft.getMinecraft(Minecraft.class).gameSettings).signalindustries$getKeyShowIndex();
         if(showIndexKey.isPressed()){
-            show = !show;
+            show = false;
         }
         if(i == Keyboard.KEY_ADD || i == Keyboard.KEY_RIGHT){
             if(page < pageMax) page++;