aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java4
-rw-r--r--src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java14
-rw-r--r--src/Java/gtPlusPlus/core/slots/SlotFuelRod.java36
-rw-r--r--src/resources/assets/miscutils/textures/items/itemHeliumBlob.pngbin0 -> 3827 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemKey.pngbin0 -> 258 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemWaterBottle.pngbin0 -> 262 bytes
6 files changed, 46 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java
index e4e9d9985c..0f5bbcbb3b 100644
--- a/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java
@@ -51,8 +51,8 @@ public class HeliumGenerator extends BlockContainer
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister p_149651_1_)
{
- this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel2");
- this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel2");
+ this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel");
+ this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel");
this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel");
this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel");
}
diff --git a/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java b/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java
index f98d0cd561..ffa778a8c6 100644
--- a/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java
+++ b/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java
@@ -5,6 +5,7 @@ import gtPlusPlus.core.inventories.InventoryHeliumGenerator;
import gtPlusPlus.core.slots.SlotFuelRod;
import gtPlusPlus.core.slots.SlotNoInput;
import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator;
+import gtPlusPlus.core.util.Utils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -23,11 +24,12 @@ public class Container_HeliumGenerator extends Container {
private final int posZ;
- public static int StorageSlotNumber = 18; //Number of slots in storage area
+ public static int StorageSlotNumber = 19; //Number of slots in storage area
public static int InventorySlotNumber = 36; //Inventory Slots (Inventory and Hotbar)
public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; //All slots
- private final int[] slotStorage = new int[15];
+ //0 Is output, 1-18 are input.
+ private final int[] slotStorage = new int[19];
public Container_HeliumGenerator(final InventoryPlayer inventory, final TileEntityHeliumGenerator te){
this.tile_entity = te;
@@ -43,7 +45,7 @@ public class Container_HeliumGenerator extends Container {
int o=0;
//Output
- this.addSlotToContainer(new SlotNoInput(this.inventoryChest, 0, 80, 35));
+ this.addSlotToContainer(new SlotNoInput(this.inventoryChest, 0, 80, 53));
this.slotStorage[o] = o;
o++;
@@ -52,7 +54,8 @@ public class Container_HeliumGenerator extends Container {
{
for (var7 = 0; var7 < 3; ++var7)
{
- this.addSlotToContainer(new SlotFuelRod(this.inventoryChest, var7 + (var6 * 4), 36+ 8 + (var7 * 18), 8 + 7 + (var6 * 18)));
+ Utils.LOG_INFO("Adding slots at var:"+(o)+" x:"+(8 + var7 * 18)+" y:"+(9 + var6 * 18));
+ this.addSlotToContainer(new SlotFuelRod(this.inventoryChest, o, 8 + (var7 * 18), 18 + (var6 * 18)));
this.slotStorage[o] = o;
o++;
}
@@ -63,7 +66,8 @@ public class Container_HeliumGenerator extends Container {
{
for (var7 = 0; var7 < 3; ++var7)
{
- this.addSlotToContainer(new SlotFuelRod(this.inventoryChest, var7 + (var6 * 4), 90 + 8 + (var7 * 18), 8 + 7 + (var6 * 18)));
+ Utils.LOG_INFO("Adding slots at var:"+(o)+" x:"+(90+8+(var7 * 18))+" y:"+(9 + var6 * 18));
+ this.addSlotToContainer(new SlotFuelRod(this.inventoryChest, o, 116 + (var7 * 18), 18 + (var6 * 18)));
this.slotStorage[o] = o;
o++;
}
diff --git a/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java b/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java
index f925376c69..7933ea136e 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java
@@ -1,5 +1,6 @@
package gtPlusPlus.core.slots;
+import gregtech.api.enums.ItemList;
import ic2.core.Ic2Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
@@ -14,7 +15,40 @@ public class SlotFuelRod extends Slot{
@Override
public boolean isItemValid(final ItemStack itemstack) {
- return itemstack.getItem().getClass() == Ic2Items.fuelRod.getItem().getClass();
+ boolean returnValue = false;
+ //Uranium Rods
+ if (itemstack.getItem() == Ic2Items.reactorUraniumSimple.getItem()){
+ returnValue = true;
+ }
+ else if (itemstack.getItem() == Ic2Items.reactorUraniumDual.getItem()){
+ returnValue = true;
+ }
+ else if (itemstack.getItem() == Ic2Items.reactorUraniumQuad.getItem()){
+ returnValue = true;
+ }
+
+ //Mox Rods
+ if (itemstack.getItem() == Ic2Items.reactorMOXSimple.getItem()){
+ returnValue = true;
+ }
+ else if (itemstack.getItem() == Ic2Items.reactorMOXDual.getItem()){
+ returnValue = true;
+ }
+ else if (itemstack.getItem() == Ic2Items.reactorMOXQuad.getItem()){
+ returnValue = true;
+ }
+
+ //Thorium Rods
+ if (itemstack.getItem() == ItemList.ThoriumCell_1.getItem()){
+ returnValue = true;
+ }
+ else if (itemstack.getItem() == ItemList.ThoriumCell_2.getItem()){
+ returnValue = true;
+ }
+ else if (itemstack.getItem() == ItemList.ThoriumCell_4.getItem()){
+ returnValue = true;
+ }
+ return returnValue;
}
@Override
diff --git a/src/resources/assets/miscutils/textures/items/itemHeliumBlob.png b/src/resources/assets/miscutils/textures/items/itemHeliumBlob.png
new file mode 100644
index 0000000000..57028cc8e6
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemHeliumBlob.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemKey.png b/src/resources/assets/miscutils/textures/items/itemKey.png
new file mode 100644
index 0000000000..19527cc2ae
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemKey.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemWaterBottle.png b/src/resources/assets/miscutils/textures/items/itemWaterBottle.png
new file mode 100644
index 0000000000..942a9ffb5f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemWaterBottle.png
Binary files differ
generated by cgit (git 2.46.0) at 2025-03-10 19:43:40 +0000