aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/tileentities/machines
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core/tileentities/machines')
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java17
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java42
2 files changed, 28 insertions, 31 deletions
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
index 9d466ccdba..252b92984e 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
@@ -1,21 +1,15 @@
package gtPlusPlus.core.tileentities.machines;
-import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeList;
-import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeListFormChange;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.container.Container_ModularityTable;
import gtPlusPlus.core.inventories.modulartable.InventoryModularMain;
import gtPlusPlus.core.inventories.modulartable.InventoryModularOutput;
import gtPlusPlus.core.item.bauble.ModularBauble;
import gtPlusPlus.core.tileentities.base.TileEntityBase;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.array.Pair;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.nbt.ModularArmourUtils;
@@ -56,6 +50,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
return this.mRecipeTimeRemaining;
}
+ @Override
@SuppressWarnings("static-method")
public NBTTagCompound getTag(final NBTTagCompound nbt, final String tag) {
if (!nbt.hasKey(tag)) {
@@ -331,7 +326,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
@Override
public boolean canInsertItem(int slot, ItemStack item, int side) {
- Utils.LOG_INFO("Slot:"+slot+" | side? "+side);
+ Logger.INFO("Slot:"+slot+" | side? "+side);
/*if (side == 1){
return this.inventoryOutputs.isItemValidForSlot(slot-9, item);
@@ -346,17 +341,19 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
@Override
public boolean canExtractItem(int slot, ItemStack item, int side) {
- Utils.LOG_INFO("Slot:"+slot+" | side? "+side);
+ Logger.INFO("Slot:"+slot+" | side? "+side);
if (slot == 11 || slot <= 8){
return true;
}
return false;
}
+ @Override
public String getCustomName() {
return this.customName;
}
+ @Override
public void setCustomName(String customName) {
this.customName = customName;
}
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
index d209688d99..d76b66b4cd 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
@@ -5,12 +5,12 @@ import java.util.Vector;
import gregtech.api.enums.ItemList;
import gregtech.common.items.GT_MetaGenerated_Item_01;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.container.Container_ProjectTable;
import gtPlusPlus.core.inventories.projecttable.InventoryProjectMain;
import gtPlusPlus.core.inventories.projecttable.InventoryProjectOutput;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.bauble.ModularBauble;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.nbt.ModularArmourUtils;
import gtPlusPlus.core.util.nbt.ModularArmourUtils.BT;
@@ -139,7 +139,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
|| (dataStick == GregtechItemList.Old_Tool_DataStick.get(1))
|| (dataStick.getItem() instanceof MetaGeneratedGregtechItems && dataStick.getItemDamage() == 32208)){
- Utils.LOG_INFO("Found Data Stick and valid container.");
+ Logger.INFO("Found Data Stick and valid container.");
ItemStack outputComponent = container.getOutputContent();
@@ -151,17 +151,17 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
NBTUtils.setBookTitle(newStick, "Encrypted Project Data");
NBTUtils.setBoolean(newStick, "mEncrypted", true);
int slotm=0;
- Utils.LOG_WARNING("Uploading to Data Stick.");
+ Logger.WARNING("Uploading to Data Stick.");
for (ItemStack is : NBTUtils.readItemsFromNBT(newStick)){
if (is != null){
- Utils.LOG_WARNING("Uploaded "+is.getDisplayName()+" into memory slot "+slotm+".");
+ Logger.WARNING("Uploaded "+is.getDisplayName()+" into memory slot "+slotm+".");
}
else {
- Utils.LOG_WARNING("Left memory slot "+slotm+" blank.");
+ Logger.WARNING("Left memory slot "+slotm+" blank.");
}
slotm++;
}
- Utils.LOG_WARNING("Encrypting Data Stick.");
+ Logger.WARNING("Encrypting Data Stick.");
this.inventoryOutputs.setInventorySlotContents(1, newStick);
this.inventoryOutputs.setInventorySlotContents(0, null);
}
@@ -170,12 +170,12 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
//Utils.LOG_INFO("Doing thing 1");
if (dataStick != null)
if (dataStick.getItem() instanceof ModularBauble){
- Utils.LOG_INFO("Doing thing 2");
+ Logger.INFO("Doing thing 2");
ItemStack tBauble = dataStick;
dataStick = null;
this.inventoryOutputs.setInventorySlotContents(0, dataStick);
if (this.inventoryGrid != null){
- Utils.LOG_INFO("Doing things");
+ Logger.INFO("Doing things");
ItemStack[] tStack = container.getInputComponents();
if (tStack != null){
//Utils.LOG_INFO(""+tStack.length);
@@ -184,29 +184,29 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
ItemStack testStack;
if ((testStack = container.inventoryGrid.getStackInSlot(i)) != null){
- Utils.LOG_INFO("FOUND: "+testStack.getDisplayName());
+ Logger.INFO("FOUND: "+testStack.getDisplayName());
}
if (tStack[i] != null){
- Utils.LOG_INFO("found "+tStack[i].getDisplayName());
+ Logger.INFO("found "+tStack[i].getDisplayName());
try {
if (tStack[i].getItem() == Items.feather){
ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_BELT);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
this.inventoryGrid.setInventorySlotContents(i, null);
}
if (tStack[i].getItem() == Items.bed){
ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_RING);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
this.inventoryGrid.setInventorySlotContents(i, null);
}
if (tStack[i].getItem() == Items.boat){
ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_AMULET);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
this.inventoryGrid.setInventorySlotContents(i, null);
@@ -214,7 +214,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
if (tStack[i].getItem() == Items.egg){
ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_HOLY, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_HOLY)+1);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
this.inventoryGrid.setInventorySlotContents(i, null);
@@ -222,7 +222,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
if (tStack[i].getItem() == Items.baked_potato){
ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DEF, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DEF)+1);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
this.inventoryGrid.setInventorySlotContents(i, null);
@@ -230,7 +230,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
if (tStack[i].getItem() == Items.cooked_beef){
ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_HP, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_HP)+1);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
this.inventoryGrid.setInventorySlotContents(i, null);
@@ -238,25 +238,25 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
if (tStack[i] == ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:17019", 17019, 1)){
ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DEF, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DEF)+1);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
}
if (tStack[i] == ItemList.Electric_Motor_LV.get(1)){
ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DAMAGE, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DAMAGE)+1);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
}
else if (tStack[i] == ItemList.Electric_Motor_MV.get(1)){
ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DAMAGE, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DAMAGE)+2);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
}
else if (tStack[i] == ItemList.Electric_Motor_HV.get(1)){
ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DAMAGE, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DAMAGE)+3);
- Utils.LOG_INFO("buffed Modular bauble");
+ Logger.INFO("buffed Modular bauble");
tStack[i] = null;
container.inventoryGrid.setInventorySlotContents(i, null);
}
@@ -266,7 +266,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
}
}
}
- Utils.LOG_INFO("set new Modular bauble");
+ Logger.INFO("set new Modular bauble");
this.inventoryOutputs.setInventorySlotContents(1, tBauble);
}
}
generated by cgit (git 2.46.0) at 2025-06-26 02:07:59 +0000