aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-08-05 15:55:15 +1000
committerAlkalus <draknyte1@hotmail.com>2017-08-05 15:55:15 +1000
commit6726e0c91215e74f6f0706eaa06df160aee3c3da (patch)
treeceaf3168042eb67755f336d911a50ba2e5c217a9 /src/Java/gtPlusPlus/xmod/gregtech
parent8d5d791b1cb53f9b66a36c5bc37ffbef8ac8fc43 (diff)
downloadGT5-Unofficial-6726e0c91215e74f6f0706eaa06df160aee3c3da.tar.gz
GT5-Unofficial-6726e0c91215e74f6f0706eaa06df160aee3c3da.tar.bz2
GT5-Unofficial-6726e0c91215e74f6f0706eaa06df160aee3c3da.zip
+ Added the Computer Cube.
+ Added recipes for the tesseract devices.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java28
3 files changed, 22 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 1b9a082d7d..ad2406fead 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -191,7 +191,10 @@ public enum GregtechItemList implements GregtechItemContainer {
AcceleratorIV, AcceleratorLuV, AcceleratorZPM, AcceleratorUV,
//GT RTG
- Pellet_RTG_PU238, Pellet_RTG_SR90, Pellet_RTG_PO210, Pellet_RTG_AM241
+ Pellet_RTG_PU238, Pellet_RTG_SR90, Pellet_RTG_PO210, Pellet_RTG_AM241,
+
+ //Computer Cube
+ Gregtech_Computer_Cube
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index fc9ed31f21..b6fdbb4272 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -179,6 +179,10 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
GregtechItemList.Pellet_RTG_PO210.set(this.addItem(43, StringUtils.superscript("210")+"Po Pellet", "", new Object[]{getTcAspectStack(TC_Aspects.RADIO, 4L), getTcAspectStack(TC_Aspects.POTENTIA, 2L), getTcAspectStack(TC_Aspects.METALLUM, 2L)}));
GregtechItemList.Pellet_RTG_AM241.set(this.addItem(44, StringUtils.superscript("241")+"Am Pellet", "", new Object[]{getTcAspectStack(TC_Aspects.RADIO, 4L), getTcAspectStack(TC_Aspects.POTENTIA, 2L), getTcAspectStack(TC_Aspects.METALLUM, 2L)}));
+ //Computer Cube
+ GregtechItemList.Gregtech_Computer_Cube.set(this.addItem(tLastID = 55, "Gregtech Computer Cube", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 8L), getTcAspectStack(TC_Aspects.METALLUM, 8L), getTcAspectStack(TC_Aspects.POTENTIA, 8L)}));
+ this.setElectricStats(32000 + tLastID, Integer.MAX_VALUE, GT_Values.V[5], 5L, -3L, true);
+
//FOOOOOOOOOOOOOOD
GregtechItemList.Food_Baked_Raisin_Bread.set(this.addItem(tLastID = 60, "Raisin Bread", "Extra Raisins, Just for ImQ009", new Object[]{new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L), getTcAspectStack(TC_Aspects.IGNIS, 1L)}));
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
index d859e76128..35ff70d775 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
@@ -195,7 +195,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
final float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ);
switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) {
case 0:
- Utils.LOG_INFO("Freq. -1 | " + this.mFrequency);
+ Utils.LOG_WARNING("Freq. -1 | " + this.mFrequency);
try {
CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
} catch (Throwable t) {
@@ -204,14 +204,14 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
break;
case 1:
- Utils.LOG_INFO("Freq. +1 | " + this.mFrequency);
+ Utils.LOG_WARNING("Freq. +1 | " + this.mFrequency);
try {
CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
} catch (Throwable t) {
}
this.mFrequency += 1;
default:
- // Utils.LOG_INFO("Did not click the correct place.");
+ // Utils.LOG_WARNING("Did not click the correct place.");
break;
}
if (getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this){
@@ -549,49 +549,49 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
- //Utils.LOG_INFO("Ticking Generator. 0");
+ //Utils.LOG_WARNING("Ticking Generator. 0");
if (this.getBaseMetaTileEntity().isServerSide()) {
- //Utils.LOG_INFO("Ticking Generator.");
+ //Utils.LOG_WARNING("Ticking Generator.");
// Set owner
if (PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName()) != null) {
if (this.mOwner == null) {
- Utils.LOG_INFO("Setting Generators Owner. 1");
+ Utils.LOG_WARNING("Setting Generators Owner. 1");
this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
}
}
if (this.mFrequency != this.oFrequency) {
- Utils.LOG_INFO("mFreq != oFreq");
+ Utils.LOG_WARNING("mFreq != oFreq");
if (getGeneratorEntity() == this) {
getGeneratorEntity(this.oFrequency);
this.getBaseMetaTileEntity().issueBlockUpdate();
- Utils.LOG_INFO("this Gen == oFreq on map - do block update");
+ Utils.LOG_WARNING("this Gen == oFreq on map - do block update");
}
- Utils.LOG_INFO("mFreq will be set to oFreq");
+ Utils.LOG_WARNING("mFreq will be set to oFreq");
this.oFrequency = this.mFrequency;
}
if ((this.getBaseMetaTileEntity().isAllowedToWork())
&& (this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(this.mNeededEnergy, false))) {
- //Utils.LOG_INFO("Can Work & Has Energy");
+ //Utils.LOG_WARNING("Can Work & Has Energy");
if ((getGeneratorEntity(Integer.valueOf(this.mFrequency)) == null)
|| (!getGeneratorEntity(Integer.valueOf(this.mFrequency)).isValidTesseractGenerator(null,
true))) {
- //Utils.LOG_INFO("storing TE I think to mFreq map?");
+ //Utils.LOG_WARNING("storing TE I think to mFreq map?");
TesseractHelper.setGeneratorOwnershipByPlayer(PlayerUtils.getPlayerOnServerFromUUID(mOwner),
this.mFrequency, this);
}
} else {
if (getGeneratorEntity(Integer.valueOf(this.mFrequency)) == this) {
- Utils.LOG_INFO("this gen == mFreq on map - do block update");
+ Utils.LOG_WARNING("this gen == mFreq on map - do block update");
TesseractHelper.removeGenerator(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency);
this.getBaseMetaTileEntity().issueBlockUpdate();
}
this.isWorking = 0;
}
if (getGeneratorEntity(Integer.valueOf(this.mFrequency)) == this) {
- //Utils.LOG_INFO("mFreq == this - do work related things");
+ //Utils.LOG_WARNING("mFreq == this - do work related things");
if (this.isWorking < 20) {
this.isWorking = ((byte) (this.isWorking + 1));
}
@@ -693,7 +693,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
if (this.getBaseMetaTileEntity().getOwnerName() != null
&& !this.getBaseMetaTileEntity().getOwnerName().equals("")) {
this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
- Utils.LOG_INFO("Setting Generators Owner. 2");
+ Utils.LOG_WARNING("Setting Generators Owner. 2");
}
super.onCreated(aStack, aWorld, aPlayer);
}