aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-03-28 20:07:06 +0200
committerTechnus <daniel112092@gmail.com>2017-03-28 20:07:06 +0200
commit5f6934c043297f47e342688c978dfa67f1b5db4f (patch)
tree89d183f001c7ff3ac03c69da0721e97cdf7ccee5 /src/main
parent8b7a9f6ecfc106741dcf8fd999fc364ac948beed (diff)
downloadGT5-Unofficial-5f6934c043297f47e342688c978dfa67f1b5db4f.tar.gz
GT5-Unofficial-5f6934c043297f47e342688c978dfa67f1b5db4f.tar.bz2
GT5-Unofficial-5f6934c043297f47e342688c978dfa67f1b5db4f.zip
Move Meta id's, some small work on collider
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/TecTech.java6
-rw-r--r--src/main/java/com/github/technus/tectech/loader/Machines.java162
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java41
3 files changed, 121 insertions, 88 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 73a03c5567..db8dbc4208 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -116,12 +116,8 @@ public class TecTech {
DebugBuilder.INSTANCE.setCreativeTab(mainTab);
}
- /**
- * Do some stuff once the server starts
- *
- * @param pEvent
- */
@EventHandler
public void serverLoad(FMLServerStartingEvent pEvent) {
+ //Be Lazy...
}
}
diff --git a/src/main/java/com/github/technus/tectech/loader/Machines.java b/src/main/java/com/github/technus/tectech/loader/Machines.java
index 74157cd1cf..58871eea66 100644
--- a/src/main/java/com/github/technus/tectech/loader/Machines.java
+++ b/src/main/java/com/github/technus/tectech/loader/Machines.java
@@ -12,118 +12,118 @@ import static com.github.technus.tectech.thing.CustomItemList.*;
* Created by danie_000 on 16.11.2016.
*/
public class Machines implements Runnable {
- public void run() {
+ public void run() {//TODO add config for starting position
// ===================================================================================================
// eM IN
// ===================================================================================================
eM_in_UV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 12070, "hatch.emin.tier.08", "UV Elemental Input Hatch", 8).getStackForm(1L));
+ 15000, "hatch.emin.tier.08", "UV Elemental Input Hatch", 8).getStackForm(1L));
eM_in_UHV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 12071, "hatch.emin.tier.09", "UHV Elemental Input Hatch", 9).getStackForm(1L));
+ 15001, "hatch.emin.tier.09", "UHV Elemental Input Hatch", 9).getStackForm(1L));
eM_in_UEV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 12072, "hatch.emin.tier.10", "UEV Elemental Input Hatch", 10).getStackForm(1L));
+ 15002, "hatch.emin.tier.10", "UEV Elemental Input Hatch", 10).getStackForm(1L));
eM_in_UIV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 12073, "hatch.emin.tier.11", "UIV Elemental Input Hatch", 11).getStackForm(1L));
+ 15003, "hatch.emin.tier.11", "UIV Elemental Input Hatch", 11).getStackForm(1L));
eM_in_UMV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 12074, "hatch.emin.tier.12", "UMV Elemental Input Hatch", 12).getStackForm(1L));
+ 15004, "hatch.emin.tier.12", "UMV Elemental Input Hatch", 12).getStackForm(1L));
eM_in_UXV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 12075, "hatch.emin.tier.13", "UXV Elemental Input Hatch", 13).getStackForm(1L));
+ 15005, "hatch.emin.tier.13", "UXV Elemental Input Hatch", 13).getStackForm(1L));
// ===================================================================================================
// eM OUT
// ===================================================================================================
eM_out_UV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 12080, "hatch.emout.tier.08", "UV Elemental Output Hatch", 8).getStackForm(1L));
+ 15010, "hatch.emout.tier.08", "UV Elemental Output Hatch", 8).getStackForm(1L));
eM_out_UHV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 12081, "hatch.emout.tier.09", "UHV Elemental Output Hatch", 9).getStackForm(1L));
+ 15011, "hatch.emout.tier.09", "UHV Elemental Output Hatch", 9).getStackForm(1L));
eM_out_UEV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 12082, "hatch.emout.tier.10", "UEV Elemental Output Hatch", 10).getStackForm(1L));
+ 15012, "hatch.emout.tier.10", "UEV Elemental Output Hatch", 10).getStackForm(1L));
eM_out_UIV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 12083, "hatch.emout.tier.11", "UIV Elemental Output Hatch", 11).getStackForm(1L));
+ 15013, "hatch.emout.tier.11", "UIV Elemental Output Hatch", 11).getStackForm(1L));
eM_out_UMV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 12084, "hatch.emout.tier.12", "UMV Elemental Output Hatch", 12).getStackForm(1L));
+ 15014, "hatch.emout.tier.12", "UMV Elemental Output Hatch", 12).getStackForm(1L));
eM_out_UXV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 12085, "hatch.emout.tier.13", "UXV Elemental Output Hatch", 13).getStackForm(1L));
+ 15015, "hatch.emout.tier.13", "UXV Elemental Output Hatch", 13).getStackForm(1L));
// ===================================================================================================
// eM Waste OUT
// ===================================================================================================
- eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_MufflerElemental(
- 12090, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f).getStackForm(1L));
+ eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_MufflerElemental(
+ 15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f).getStackForm(1L));
eM_muffler_UHV.set(new GT_MetaTileEntity_Hatch_MufflerElemental(
- 12091, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f).getStackForm(1L));
+ 15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f).getStackForm(1L));
eM_muffler_UEV.set(new GT_MetaTileEntity_Hatch_MufflerElemental(
- 12092, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f).getStackForm(1L));
+ 15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f).getStackForm(1L));
eM_muffler_UIV.set(new GT_MetaTileEntity_Hatch_MufflerElemental(
- 12093, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f).getStackForm(1L));
+ 15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f).getStackForm(1L));
eM_muffler_UMV.set(new GT_MetaTileEntity_Hatch_MufflerElemental(
- 12094, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f).getStackForm(1L));
+ 15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f).getStackForm(1L));
eM_muffler_UXV.set(new GT_MetaTileEntity_Hatch_MufflerElemental(
- 12095, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f).getStackForm(1L));
+ 15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f).getStackForm(1L));
// ===================================================================================================
// Multi AMP Power INPUTS
// ===================================================================================================
eM_energymulti4_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12100, "hatch.energymulti04.tier.08", "UV 4A Energy Hatch", 8, 4).getStackForm(1L));
+ 15100, "hatch.energymulti04.tier.08", "UV 4A Energy Hatch", 8, 4).getStackForm(1L));
eM_energymulti16_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12110, "hatch.energymulti16.tier.08", "UV 16A Energy Hatch", 8, 16).getStackForm(1L));
+ 15110, "hatch.energymulti16.tier.08", "UV 16A Energy Hatch", 8, 16).getStackForm(1L));
eM_energymulti64_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12120, "hatch.energymulti64.tier.08", "UV 64A Energy Hatch", 8, 64).getStackForm(1L));
+ 15120, "hatch.energymulti64.tier.08", "UV 64A Energy Hatch", 8, 64).getStackForm(1L));
eM_energymulti4_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12101, "hatch.energymulti04.tier.09", "UHV 4A Energy Hatch", 9, 4).getStackForm(1L));
+ 15101, "hatch.energymulti04.tier.09", "UHV 4A Energy Hatch", 9, 4).getStackForm(1L));
eM_energymulti16_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12111, "hatch.energymulti16.tier.09", "UHV 16A Energy Hatch", 9, 16).getStackForm(1L));
+ 15111, "hatch.energymulti16.tier.09", "UHV 16A Energy Hatch", 9, 16).getStackForm(1L));
eM_energymulti64_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12121, "hatch.energymulti64.tier.09", "UHV 64A Energy Hatch", 9, 64).getStackForm(1L));
+ 15121, "hatch.energymulti64.tier.09", "UHV 64A Energy Hatch", 9, 64).getStackForm(1L));
eM_energymulti4_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12102, "hatch.energymulti04.tier.10", "UEV 4A Energy Hatch", 10, 4).getStackForm(1L));
+ 15102, "hatch.energymulti04.tier.10", "UEV 4A Energy Hatch", 10, 4).getStackForm(1L));
eM_energymulti16_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12112, "hatch.energymulti16.tier.10", "UEV 16A Energy Hatch", 10, 16).getStackForm(1L));
+ 15112, "hatch.energymulti16.tier.10", "UEV 16A Energy Hatch", 10, 16).getStackForm(1L));
eM_energymulti64_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12122, "hatch.energymulti64.tier.10", "UEV 64A Energy Hatch", 10, 64).getStackForm(1L));
+ 15122, "hatch.energymulti64.tier.10", "UEV 64A Energy Hatch", 10, 64).getStackForm(1L));
eM_energymulti4_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12103, "hatch.energymulti04.tier.11", "UIV 4A Energy Hatch", 11, 4).getStackForm(1L));
+ 15103, "hatch.energymulti04.tier.11", "UIV 4A Energy Hatch", 11, 4).getStackForm(1L));
eM_energymulti16_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12113, "hatch.energymulti16.tier.11", "UIV 16A Energy Hatch", 11, 16).getStackForm(1L));
+ 15113, "hatch.energymulti16.tier.11", "UIV 16A Energy Hatch", 11, 16).getStackForm(1L));
eM_energymulti64_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12123, "hatch.energymulti64.tier.11", "UIV 64A Energy Hatch", 11, 64).getStackForm(1L));
+ 15123, "hatch.energymulti64.tier.11", "UIV 64A Energy Hatch", 11, 64).getStackForm(1L));
eM_energymulti4_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12104, "hatch.energymulti04.tier.12", "UMV 4A Energy Hatch", 12, 4).getStackForm(1L));
+ 15104, "hatch.energymulti04.tier.12", "UMV 4A Energy Hatch", 12, 4).getStackForm(1L));
eM_energymulti16_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12114, "hatch.energymulti16.tier.12", "UMV 16A Energy Hatch", 12, 16).getStackForm(1L));
+ 15114, "hatch.energymulti16.tier.12", "UMV 16A Energy Hatch", 12, 16).getStackForm(1L));
eM_energymulti64_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12124, "hatch.energymulti64.tier.12", "UMV 64A Energy Hatch", 12, 64).getStackForm(1L));
+ 15124, "hatch.energymulti64.tier.12", "UMV 64A Energy Hatch", 12, 64).getStackForm(1L));
eM_energymulti4_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12105, "hatch.energymulti04.tier.13", "UXV 4A Energy Hatch", 13, 4).getStackForm(1L));
+ 15105, "hatch.energymulti04.tier.13", "UXV 4A Energy Hatch", 13, 4).getStackForm(1L));
eM_energymulti16_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12115, "hatch.energymulti16.tier.13", "UXV 16A Energy Hatch", 13, 16).getStackForm(1L));
+ 15115, "hatch.energymulti16.tier.13", "UXV 16A Energy Hatch", 13, 16).getStackForm(1L));
eM_energymulti64_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 12125, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64).getStackForm(1L));
+ 15125, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64).getStackForm(1L));
// ===================================================================================================
@@ -131,81 +131,87 @@ public class Machines implements Runnable {
// ===================================================================================================
eM_dynamomulti4_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12130, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo Hatch", 8, 4).getStackForm(1L));
+ 15200, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo Hatch", 8, 4).getStackForm(1L));
eM_dynamomulti16_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12140, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo Hatch", 8, 16).getStackForm(1L));
+ 15210, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo Hatch", 8, 16).getStackForm(1L));
eM_dynamomulti64_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12150, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo Hatch", 8, 64).getStackForm(1L));
+ 15220, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo Hatch", 8, 64).getStackForm(1L));
eM_dynamomulti4_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12131, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo Hatch", 9, 4).getStackForm(1L));
+ 15201, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo Hatch", 9, 4).getStackForm(1L));
eM_dynamomulti16_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12141, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo Hatch", 9, 16).getStackForm(1L));
+ 15211, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo Hatch", 9, 16).getStackForm(1L));
eM_dynamomulti64_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12151, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo Hatch", 9, 64).getStackForm(1L));
+ 15221, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo Hatch", 9, 64).getStackForm(1L));
eM_dynamomulti4_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12132, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo Hatch", 10, 4).getStackForm(1L));
+ 15202, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo Hatch", 10, 4).getStackForm(1L));
eM_dynamomulti16_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12142, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo Hatch", 10, 16).getStackForm(1L));
+ 15212, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo Hatch", 10, 16).getStackForm(1L));
eM_dynamomulti64_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12152, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo Hatch", 10, 64).getStackForm(1L));
+ 15222, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo Hatch", 10, 64).getStackForm(1L));
eM_dynamomulti4_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12133, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo Hatch", 11, 4).getStackForm(1L));
+ 15203, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo Hatch", 11, 4).getStackForm(1L));
eM_dynamomulti16_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12143, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo Hatch", 11, 16).getStackForm(1L));
+ 15213, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo Hatch", 11, 16).getStackForm(1L));
eM_dynamomulti64_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12153, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo Hatch", 11, 64).getStackForm(1L));
+ 15223, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo Hatch", 11, 64).getStackForm(1L));
eM_dynamomulti4_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12134, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo Hatch", 12, 4).getStackForm(1L));
+ 15204, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo Hatch", 12, 4).getStackForm(1L));
eM_dynamomulti16_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12144, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo Hatch", 12, 16).getStackForm(1L));
+ 15214, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo Hatch", 12, 16).getStackForm(1L));
eM_dynamomulti64_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12154, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo Hatch", 12, 64).getStackForm(1L));
+ 15224, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo Hatch", 12, 64).getStackForm(1L));
eM_dynamomulti4_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12135, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo Hatch", 13, 4).getStackForm(1L));
+ 15205, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo Hatch", 13, 4).getStackForm(1L));
eM_dynamomulti16_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12145, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo Hatch", 13, 16).getStackForm(1L));
+ 15215, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo Hatch", 13, 16).getStackForm(1L));
eM_dynamomulti64_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 12155, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch", 13, 64).getStackForm(1L));
+ 15225, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch", 13, 64).getStackForm(1L));
// ===================================================================================================
// MULTIBLOCKS EM
// ===================================================================================================
- Machine_Multi_Transformer.set(new GT_MetaTileEntity_EM_transformer(12160, "multimachine.em.transformer", "Active Transformer").getStackForm(1L));
- Machine_Multi_Infuser.set(new GT_MetaTileEntity_EM_infuser(12161,"multimachine.em.infuser","Energy Infuser").getStackForm(1));
- Machine_Multi_MatterToEM.set(new GT_MetaTileEntity_EM_quantizer(12162, "multimachine.em.mattertoem", "Matter Quantizer").getStackForm(1L));
- Machine_Multi_EMToMatter.set(new GT_MetaTileEntity_EM_dequantizer(12163, "multimachine.em.emtomatter", "Matter Dequantizer").getStackForm(1L));
- Machine_Multi_EMjunction.set(new GT_MetaTileEntity_EM_junction(12164, "multimachine.em.junction", "Matter Junction").getStackForm(1L));
- Machine_Multi_EMmachine.set(new GT_MetaTileEntity_EM_machine(12165, "multimachine.em.processing", "Quantum Processing Machine").getStackForm(1L));
- Machine_Multi_EMCrafter.set(new GT_MetaTileEntity_EM_crafter(12166, "multimachine.em.crafter", "Matter Assembler").getStackForm(1L));
- Machine_Multi_Collider.set(new GT_MetaTileEntity_EM_collider(12167, "multimachine.em.collider", "Matter Collider").getStackForm(1L));
- Machine_Multi_BHG.set(new GT_MetaTileEntity_EM_bhg(12168, "multimachine.em.blackholegenerator", "Black Hole Generator").getStackForm(1L));
- Machine_Multi_Wormhole.set(new GT_MetaTileEntity_EM_wormhole(12169, "multimachine.em.wormhole", "Wormhole").getStackForm(1L));
- Machine_Multi_Stabilizer.set(new GT_MetaTileEntity_EM_stabilizer(12170, "multimachine.em.stabilizer", "Elemental Stabilizer").getStackForm(1L));
- Machine_Multi_Scanner.set(new GT_MetaTileEntity_EM_scanner(12171, "multimachine.em.scanner", "Elemental Scanner").getStackForm(1L));
- Machine_Multi_Computer.set(new GT_MetaTileEntity_EM_computer(12172, "multimachine.em.computer", "Quantum Computer").getStackForm(1L));
- Machine_Multi_Switch.set(new GT_MetaTileEntity_EM_switch(12173, "multimachine.em.switch", "Network Switch With QoS").getStackForm(1L));
+ Machine_Multi_Transformer.set(new GT_MetaTileEntity_EM_transformer(15300, "multimachine.em.transformer", "Active Transformer").getStackForm(1L));
+ Machine_Multi_Infuser.set(new GT_MetaTileEntity_EM_infuser(15301,"multimachine.em.infuser","Energy Infuser").getStackForm(1));
- Machine_DebugWriter.set(new GT_MetaTileEntity_DebugStructureWriter(12179,"debug.tt.writer","Debug Structure Writer",15).getStackForm(1L));
+ Machine_Multi_MatterToEM.set(new GT_MetaTileEntity_EM_quantizer(15340, "multimachine.em.mattertoem", "Matter Quantizer").getStackForm(1L));
+ Machine_Multi_EMToMatter.set(new GT_MetaTileEntity_EM_dequantizer(15341, "multimachine.em.emtomatter", "Matter Dequantizer").getStackForm(1L));
+ Machine_Multi_EMjunction.set(new GT_MetaTileEntity_EM_junction(15342, "multimachine.em.junction", "Matter Junction").getStackForm(1L));
+ Machine_Multi_EMmachine.set(new GT_MetaTileEntity_EM_machine(15343, "multimachine.em.processing", "Quantum Processing Machine").getStackForm(1L));
+ Machine_Multi_EMCrafter.set(new GT_MetaTileEntity_EM_crafter(15344, "multimachine.em.crafter", "Matter Assembler").getStackForm(1L));
+ Machine_Multi_Collider.set(new GT_MetaTileEntity_EM_collider(15345, "multimachine.em.collider", "Matter Collider").getStackForm(1L));
+ Machine_Multi_BHG.set(new GT_MetaTileEntity_EM_bhg(15346, "multimachine.em.blackholegenerator", "Black Hole Generator").getStackForm(1L));
+ Machine_Multi_Wormhole.set(new GT_MetaTileEntity_EM_wormhole(15347, "multimachine.em.wormhole", "Wormhole").getStackForm(1L));
+ Machine_Multi_Stabilizer.set(new GT_MetaTileEntity_EM_stabilizer(15348, "multimachine.em.stabilizer", "Elemental Stabilizer").getStackForm(1L));
+ Machine_Multi_Scanner.set(new GT_MetaTileEntity_EM_scanner(15349, "multimachine.em.scanner", "Elemental Scanner").getStackForm(1L));
+
+ Machine_Multi_Computer.set(new GT_MetaTileEntity_EM_computer(15380, "multimachine.em.computer", "Quantum Computer").getStackForm(1L));
+ Machine_Multi_Switch.set(new GT_MetaTileEntity_EM_switch(15381, "multimachine.em.switch", "Network Switch With QoS").getStackForm(1L));
// ===================================================================================================
// Hatches EM
// ===================================================================================================
- Parametrizer_Hatch.set(new GT_MetaTileEntity_Hatch_Param(12180, "hatch.param.tier.08", "Parametrizer", 8).getStackForm(1L));
- Uncertainty_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(12181, "hatch.certain.tier.08", "Uncertainty Resolver", 10).getStackForm(1L));
- UncertaintyX_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(12182, "hatch.certain.tier.10", "Uncertainty Resolver X", 10).getStackForm(1L));
- dataIn_Hatch.set(new GT_MetaTileEntity_Hatch_InputData(12183, "hatch.datain.tier.08", "Optical Slave Connector", 8).getStackForm(1L));
- dataOut_Hatch.set(new GT_MetaTileEntity_Hatch_OutputData(12184, "hatch.dataout.tier.08", "Optical Master Connector", 8).getStackForm(1L));
+ Parametrizer_Hatch.set(new GT_MetaTileEntity_Hatch_Param(15420, "hatch.param.tier.08", "Parametrizer", 8).getStackForm(1L));
+ Uncertainty_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(15421, "hatch.certain.tier.08", "Uncertainty Resolver", 10).getStackForm(1L));
+ UncertaintyX_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(15422, "hatch.certain.tier.10", "Uncertainty Resolver X", 10).getStackForm(1L));
+ dataIn_Hatch.set(new GT_MetaTileEntity_Hatch_InputData(15423, "hatch.datain.tier.08", "Optical Slave Connector", 8).getStackForm(1L));
+ dataOut_Hatch.set(new GT_MetaTileEntity_Hatch_OutputData(15424, "hatch.dataout.tier.08", "Optical Master Connector", 8).getStackForm(1L));
// ===================================================================================================
// EM pipe
// ===================================================================================================
- EMpipe.set(new GT_MetaTileEntity_Pipe_EM(12200, "pipe.elementalmatter", "Quantum Tunnel").getStackForm(1L));
- DATApipe.set(new GT_MetaTileEntity_Pipe_Data(12201, "pipe.datastream", "Optical Fiber Cable").getStackForm(1L));
+ EMpipe.set(new GT_MetaTileEntity_Pipe_EM(15460, "pipe.elementalmatter", "Quantum Tunnel").getStackForm(1L));
+ DATApipe.set(new GT_MetaTileEntity_Pipe_Data(15461, "pipe.datastream", "Optical Fiber Cable").getStackForm(1L));
+
+ // ===================================================================================================
+ // DebugStuff
+ // ===================================================================================================
+
+ Machine_DebugWriter.set(new GT_MetaTileEntity_DebugStructureWriter(15499,"debug.tt.writer","Debug Structure Writer",15).getStackForm(1L));
}
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index abd3e53024..a7b0e237e2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -3,7 +3,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.elementalMatter.CommonValues;
import com.github.technus.tectech.thing.block.QuantumGlass;
-import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT;
import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
import com.github.technus.tectech.thing.metaTileEntity.constructableTT;
import gregtech.api.GregTech_API;
@@ -12,10 +11,10 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.common.blocks.GT_Block_Casings2;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import static com.github.technus.tectech.Util.StructureBuilder;
@@ -27,6 +26,7 @@ import static gregtech.api.enums.GT_Values.E;
public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockBase_EM implements constructableTT {
private static Textures.BlockIcons.CustomIcon ScreenOFF;
private static Textures.BlockIcons.CustomIcon ScreenON;
+ private byte eTier =0;
//use multi A energy inputs, use less power the longer it runs
private static final String[][] shape = new String[][]{
@@ -142,10 +142,41 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
}
@Override
+ public void saveNBTData(NBTTagCompound aNBT) {
+ super.saveNBTData(aNBT);
+ aNBT.setByte("eTier", eTier);
+ }
+
+ @Override
+ public void loadNBTData(NBTTagCompound aNBT) {
+ super.loadNBTData(aNBT);
+ eTier =aNBT.getByte("eTier");
+ }
+
+ @Override
public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
- return iGregTechTileEntity.getMetaIDOffset(0,-1,0)==3?
- EM_StructureCheck(shape,blockType,blockMeta,0,-2,28):
- EM_StructureCheck(shape,blockType2,blockMeta2,0,-2,28);
+ if(iGregTechTileEntity.getBlockOffset(0,-1,0)!=GT_Container_CasingsTT.sBlockCasingsTT){
+ eTier =0;
+ return false;
+ }else if(iGregTechTileEntity.getMetaIDOffset(0,-1,0)==3){
+ eTier =1;
+ }else if(iGregTechTileEntity.getMetaIDOffset(0,-1,0)==5){
+ eTier =2;
+ }else{
+ eTier =0;
+ return false;
+ }
+
+
+ boolean test;
+ switch (eTier){
+ case 1:test=EM_StructureCheck(shape,blockType,blockMeta,0,-2,28); break;
+ case 2:test=EM_StructureCheck(shape,blockType2,blockMeta2,0,-2,28); break;
+ default: eTier = 0; return false;
+ }
+ if(test) return true;
+ eTier = 0;
+ return false;
}
@Override