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.java96
1 files changed, 40 insertions, 56 deletions
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
index 15116e8fc1..be2421b307 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.tileentities.machines;
-import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeListFormChange;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -30,84 +28,72 @@ public class TileEntityModularityTable extends TileEntity {
public InventoryModularOutput inventoryOutputs;
private Container_ModularityTable container;
- public TileEntityModularityTable(){
- Utils.LOG_INFO("I am created.");
- this.inventoryGrid = new InventoryModularMain();//number of slots - without product slot
- this.inventoryOutputs = new InventoryModularOutput();//number of slots - without product slot
+ public TileEntityModularityTable() {
+ this.inventoryGrid = new InventoryModularMain();
+ this.inventoryOutputs = new InventoryModularOutput();
this.canUpdate();
generateAllValidUpgrades();
}
- public void setContainer(Container_ModularityTable container_ModularityTable){
+ public void setContainer(Container_ModularityTable container_ModularityTable) {
this.container = container_ModularityTable;
}
@SuppressWarnings("static-method")
- public NBTTagCompound getTag(final NBTTagCompound nbt, final String tag){
- if(!nbt.hasKey(tag))
- {
+ public NBTTagCompound getTag(final NBTTagCompound nbt, final String tag) {
+ if (!nbt.hasKey(tag)) {
nbt.setTag(tag, new NBTTagCompound());
}
return nbt.getCompoundTag(tag);
}
@Override
- public void writeToNBT(final NBTTagCompound nbt){
+ public void writeToNBT(final NBTTagCompound nbt) {
super.writeToNBT(nbt);
this.inventoryOutputs.writeToNBT(this.getTag(nbt, "ContentsOutput"));
}
@Override
- public void readFromNBT(final NBTTagCompound nbt){
+ public void readFromNBT(final NBTTagCompound nbt) {
super.readFromNBT(nbt);
this.inventoryOutputs.readFromNBT(nbt.getCompoundTag("ContentsOutput"));
}
@Override
public void updateEntity() {
- if (!this.worldObj.isRemote){
+ if (!this.worldObj.isRemote) {
boolean removeInputA = false;
boolean removeInputB = false;
- //Data stick
+ // Data stick
ItemStack tBauble = this.inventoryOutputs.getStackInSlot(0);
ItemStack tUpgrade = this.inventoryOutputs.getStackInSlot(1);
- if (tBauble != null && tUpgrade != null && this.container != null){
- if (tBauble.getItem() instanceof ModularBauble){
- if (tUpgrade != null && tBauble != null){
+ if (tBauble != null && tUpgrade != null && this.container != null) {
+ if (tBauble.getItem() instanceof ModularBauble) {
+ if (tUpgrade != null && tBauble != null) {
removeInputA = true;
-
- Utils.LOG_INFO("found "+tUpgrade.getDisplayName());
- try {
+ try {
removeInputB = addUpgrade(tUpgrade, tBauble);
- if (!removeInputB){
- Utils.LOG_INFO("Failed to add "+tUpgrade.getDisplayName());
+ if (!removeInputB) {
}
+ } catch (Throwable t) {
}
- catch (Throwable t){
-
- }
-
- if (removeInputA && removeInputB){
- Utils.LOG_INFO("set new Modular bauble");
- if (this.inventoryOutputs.getStackInSlot(1).stackSize > 1){
+ if (removeInputA && removeInputB) {
+ if (this.inventoryOutputs.getStackInSlot(1).stackSize > 1) {
ItemStack mTempStack = this.inventoryOutputs.getStackInSlot(1);
mTempStack.stackSize--;
this.inventoryOutputs.setInventorySlotContents(1, mTempStack);
- }
- else {
+ } else {
this.inventoryOutputs.setInventorySlotContents(1, null);
-
}
this.inventoryOutputs.setInventorySlotContents(0, null);
this.inventoryOutputs.setInventorySlotContents(2, tBauble);
- }
- else {
- Utils.LOG_INFO("1: "+removeInputA+" | 2: "+removeInputB);
+ } else {
+ Utils.LOG_INFO("1: " + removeInputA + " | 2: " + removeInputB);
}
}
}
- }
+ }
}
super.updateEntity();
}
@@ -120,67 +106,68 @@ public class TileEntityModularityTable extends TileEntity {
public static Map<ItemStack, Pair<Modifiers, Integer>> mValidUpgradeList = new HashMap<ItemStack, Pair<Modifiers, Integer>>();
public static Map<ItemStack, BT> mValidUpgradeListFormChange = new HashMap<ItemStack, BT>();
- private static boolean generateAllValidUpgrades(){
+ private static boolean generateAllValidUpgrades() {
- //Form Change
+ // Form Change
generateUpgradeFormData(ItemList.Sensor_MV.get(1), BT.TYPE_RING);
generateUpgradeFormData(ItemList.Electric_Piston_MV.get(1), BT.TYPE_BELT);
generateUpgradeFormData(ItemList.Emitter_MV.get(1), BT.TYPE_AMULET);
- //Damage Boost
+ // Damage Boost
generateUpgradeData(ItemList.Electric_Motor_LV.get(1), Modifiers.BOOST_DAMAGE, 1);
generateUpgradeData(ItemList.Electric_Motor_MV.get(1), Modifiers.BOOST_DAMAGE, 2);
generateUpgradeData(ItemList.Electric_Motor_HV.get(1), Modifiers.BOOST_DAMAGE, 3);
generateUpgradeData(ItemList.Electric_Motor_EV.get(1), Modifiers.BOOST_DAMAGE, 4);
generateUpgradeData(ItemList.Electric_Motor_IV.get(1), Modifiers.BOOST_DAMAGE, 5);
- //Defence Boost
+ // Defence Boost
generateUpgradeData(Materials.Aluminium.getPlates(1), Modifiers.BOOST_DEF, 1);
generateUpgradeData(Materials.StainlessSteel.getPlates(1), Modifiers.BOOST_DEF, 2);
generateUpgradeData(Materials.Tungsten.getPlates(1), Modifiers.BOOST_DEF, 3);
generateUpgradeData(Materials.TungstenSteel.getPlates(1), Modifiers.BOOST_DEF, 4);
generateUpgradeData(Materials.Naquadah.getPlates(1), Modifiers.BOOST_DEF, 5);
- //Hp Boost
+ // Hp Boost
generateUpgradeData(ItemUtils.simpleMetaStack(Items.golden_apple, 0, 1), Modifiers.BOOST_HP, 1);
generateUpgradeData(ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1), Modifiers.BOOST_HP, 2);
generateUpgradeData(ItemUtils.simpleMetaStack(Items.nether_star, 0, 1), Modifiers.BOOST_HP, 3);
- generateUpgradeData(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32725", 32725, 1), Modifiers.BOOST_HP, 4);
- generateUpgradeData(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32726", 32726, 1), Modifiers.BOOST_HP, 5);
+ generateUpgradeData(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32725", 32725, 1), Modifiers.BOOST_HP,
+ 4);
+ generateUpgradeData(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32726", 32726, 1), Modifiers.BOOST_HP,
+ 5);
return true;
}
- public static boolean generateUpgradeData(ItemStack tStack, Modifiers tMod, int tLevel){
+ public static boolean generateUpgradeData(ItemStack tStack, Modifiers tMod, int tLevel) {
Pair<Modifiers, Integer> tTemp = new Pair<Modifiers, Integer>(tMod, tLevel);
- if (mValidUpgradeList.put(tStack, tTemp) != null){
+ if (mValidUpgradeList.put(tStack, tTemp) != null) {
return true;
}
return false;
}
- public static boolean generateUpgradeFormData(ItemStack tStack, BT tMod){
- if (mValidUpgradeListFormChange.put(tStack, tMod) != null){
+ public static boolean generateUpgradeFormData(ItemStack tStack, BT tMod) {
+ if (mValidUpgradeListFormChange.put(tStack, tMod) != null) {
return true;
}
return false;
}
- public static boolean addUpgrade(ItemStack tStack, ItemStack tBauble){
+ public static boolean addUpgrade(ItemStack tStack, ItemStack tBauble) {
try {
Iterator<Entry<ItemStack, BT>> it = mValidUpgradeListFormChange.entrySet().iterator();
while (it.hasNext()) {
Entry<ItemStack, BT> pair = it.next();
if (pair.getKey().getItem() == tStack.getItem()
- && pair.getKey().getItemDamage() == tStack.getItemDamage()){
+ && pair.getKey().getItemDamage() == tStack.getItemDamage()) {
ModularArmourUtils.setBaubleType(tBauble, pair.getValue());
tBauble.setItemDamage(ModularArmourUtils.getBaubleTypeID(tBauble));
- //ModularArmourUtils.setBaubleType(tBauble, mValidUpgradeListFormChange.get(tStack).getThis());
return true;
}
}
- } catch (Throwable t){
+ } catch (Throwable t) {
}
try {
@@ -188,19 +175,16 @@ public class TileEntityModularityTable extends TileEntity {
while (it2.hasNext()) {
Entry<ItemStack, Pair<Modifiers, Integer>> pair = it2.next();
if (pair.getKey().getItem() == tStack.getItem()
- && pair.getKey().getItemDamage() == tStack.getItemDamage()){
+ && pair.getKey().getItemDamage() == tStack.getItemDamage()) {
Pair<Modifiers, Integer> newPair = pair.getValue();
int mCurrentLevel = ModularArmourUtils.getModifierLevel(tBauble, newPair);
ModularArmourUtils.setModifierLevel(tBauble, newPair);
return true;
}
}
- } catch (Throwable t){
+ } catch (Throwable t) {
}
- Utils.LOG_INFO("Could not find valid upgrade: "+tStack.getDisplayName()+".");
- //Utils.LOG_INFO("Bool1: "+mValidUpgradeListFormChange.containsKey(tStack));
- //Utils.LOG_INFO("Bool2: "+mValidUpgradeList.containsKey(tStack));
return false;
}
generated by cgit (git 2.46.0) at 2025-03-12 18:52:49 +0000