aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/registration
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-08-07 23:09:43 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-08-07 23:09:43 +1000
commit137eb049e600788b8a8e050fd393980b6514e51b (patch)
tree8bb46b3fb9f02bed4d3bf0a7c6c12926349ebf19 /src/Java/gtPlusPlus/xmod/gregtech/registration
parentf3ec7d2fc4ac502b085016e9dcae7799b717a194 (diff)
downloadGT5-Unofficial-137eb049e600788b8a8e050fd393980b6514e51b.tar.gz
GT5-Unofficial-137eb049e600788b8a8e050fd393980b6514e51b.tar.bz2
GT5-Unofficial-137eb049e600788b8a8e050fd393980b6514e51b.zip
$ Fixed RTG reflection.
$ Fixed issue where RTGs would revert back to HV after a restart/rejoin. $ Fixed the Thermal Boiler Assembly. % Migrated TAE to use slot 96+. + Added some extra logging to verify. $ Made Shelves have textures.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/registration')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java36
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java2
2 files changed, 19 insertions, 19 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index 95c1f6c73f..dec1d3f746 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -32,33 +32,33 @@ public class Gregtech4Content
//Free //GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", "Advanced Workbench", 1).getStackForm(1L));
}
- private static void thermalBoiler(){
- //Gregtech 4 Workbenches
- Utils.LOG_INFO("Gregtech 4 Content | Registering Thermal Boiler.");
- GregtechItemList.GT4_Thermal_Boiler.set(new GT4Entity_ThermalBoiler(810, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L));
- }
-
- private static void multiCrafter(){
- //Gregtech 4 Workbenches
- Utils.LOG_INFO("Gregtech 4 Content | Registering Multiblock Crafter.");
- GregtechItemList.GT4_Multi_Crafter.set(new GT4Entity_AutoCrafter(811, "gtplusplus.autocrafter.multi", "Large Autocrafter").getStackForm(1L));
- }
private static void tesseracts(){
- //Gregtech 4 Workbenches
+ //Gregtech 4 Tesseracts
Utils.LOG_INFO("Gregtech 4 Content | Registering Tesseracts.");
GregtechItemList.GT4_Tesseract_Generator.set(new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4).getStackForm(1L));
GregtechItemList.GT4_Tesseract_Terminal.set(new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4).getStackForm(1L));
}
private static void shelves(){
- //Gregtech 4 Workbenches
+ //Gregtech 4 Shelves
Utils.LOG_INFO("Gregtech 4 Content | Registering Shelves.");
- GregtechItemList.GT4_Shelf.set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wood encased Shelf").getStackForm(1L));
- GregtechItemList.GT4_Shelf_Iron.set(new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal encased Shelf").getStackForm(1L));
- GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(872, "gtplusplus.shelf.filecabinet", "File Cabinet").getStackForm(1L));
- GregtechItemList.GT4_Shelf_Desk.set(new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk").getStackForm(1L));
- GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(874, "gtplusplus.shelf.compartment", "Compartment").getStackForm(1L));
+ GregtechItemList.GT4_Shelf.set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wood encased Shelf", "Stores Books & Things").getStackForm(1L));
+ GregtechItemList.GT4_Shelf_Iron.set(new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal encased Shelf", "Stores Books & Things").getStackForm(1L));
+ GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(872, "gtplusplus.shelf.filecabinet", "File Cabinet", "Stores Books & Things").getStackForm(1L));
+ GregtechItemList.GT4_Shelf_Desk.set(new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "Stores Books & Things").getStackForm(1L));
+ GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(874, "gtplusplus.shelf.compartment", "Compartment", "Stores Books & Things").getStackForm(1L));
}
+
+ private static void thermalBoiler(){
+ //Gregtech 4 Thermal Boiler
+ Utils.LOG_INFO("Gregtech 4 Content | Registering Thermal Boiler.");
+ GregtechItemList.GT4_Thermal_Boiler.set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L));
+ }
+ private static void multiCrafter(){
+ //Gregtech 4 Multiblock Auto-Crafter
+ Utils.LOG_INFO("Gregtech 4 Content | Registering Multiblock Crafter.");
+ GregtechItemList.GT4_Multi_Crafter.set(new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Autocrafter").getStackForm(1L));
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
index f3e2a2c5f4..356975bc44 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
@@ -14,7 +14,7 @@ public class GregtechRTG {
}
private static void run1(){
- GregtechItemList.RTG.set(new GregtechMetaTileEntity_RTG(800, "rtg.01.tier.single", "Radioisotope Thermoelectric Generator", 3).getStackForm(1L));
+ GregtechItemList.RTG.set(new GregtechMetaTileEntity_RTG(869, "rtg.01.tier.single", "Radioisotope Thermoelectric Generator", 3).getStackForm(1L));
}
}