aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTec <daniel112092@gmail.com>2021-01-27 19:46:49 +0100
committerTec <daniel112092@gmail.com>2021-01-27 19:46:49 +0100
commitb6491dddd431943c68c823bd2572f8d904bad1e6 (patch)
tree1cdaf684bf28004ae944f4b3c0c5d8a1c6f77e75
parent957d2b9e6dd33158e7bc60ef06c6ece250640db0 (diff)
parent34b58d35f3c70a7ebc3bce4a81a6055147fd21ab (diff)
downloadGT5-Unofficial-b6491dddd431943c68c823bd2572f8d904bad1e6.tar.gz
GT5-Unofficial-b6491dddd431943c68c823bd2572f8d904bad1e6.tar.bz2
GT5-Unofficial-b6491dddd431943c68c823bd2572f8d904bad1e6.zip
Merge branch 'master' of https://github.com/Technus/TecTech
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java
index d9d5f90593..53fea9ef7c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java
@@ -342,28 +342,28 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch {
}
if (Loader.isModLoaded("OpenComputers")) {
- new RackComponent("OpenComputers:item.23", 0, 1, 0f, 100, true);//Transistor
- new RackComponent("OpenComputers:item.24", 7, 12, -.05f, 1500, true);//chip t1
- new RackComponent("OpenComputers:item.25", 18, 20, -.1f, 3000, true);//chip t2
- new RackComponent("OpenComputers:item.26", 25, 22, -.15f, 4500, true);//chip t3
- new RackComponent("OpenComputers:item.27", 10, 15, -.05f, 3000, true);//alu
- new RackComponent("OpenComputers:item.28", 25, 18, -.05f, 1500, true);//cu
-
- new RackComponent("OpenComputers:item.70", 42, 30, -.05f, 1500, true);//bus t1
- new RackComponent("OpenComputers:item.71", 70, 50, -.1f, 3000, true);//bus t2
- new RackComponent("OpenComputers:item.72", 105, 72, -.15f, 4500, true);//bus t3
-
- new RackComponent("OpenComputers:item.29", 106, 73, -.1f, 1500, true);//cpu t1
- new RackComponent("OpenComputers:item.42", 226, 153, -.15f, 3000, true);//cpu t2
- new RackComponent("OpenComputers:item.43", 374, 241, -.2f, 4500, true);//cpu t3
-
- new RackComponent("OpenComputers:item.8", 20, 27, -.1f, 1500, true);//gpu t1
- new RackComponent("OpenComputers:item.9", 62, 67, -.2f, 3000, true);//gpu t2
- new RackComponent("OpenComputers:item.10", 130, 111, -.3f, 4500, true);//gpu t3
-
- new RackComponent("OpenComputers:item.101", 350, 234, -.1f, 1500, true);//apu t1
- new RackComponent("OpenComputers:item.102", 606, 398, -.2f, 4500, true);//apu t2
- new RackComponent("OpenComputers:item.103", 1590, 1006, -.3f, 9000, true);//apu tC
+ new RackComponent("OpenComputers:item.oc.Transistor", 0, 1, 0f, 100, true);//Transistor
+ new RackComponent("OpenComputers:item.oc.Microchip0", 7, 12, -.05f, 1500, true);//chip t1
+ new RackComponent("OpenComputers:item.oc.Microchip1", 18, 20, -.1f, 3000, true);//chip t2
+ new RackComponent("OpenComputers:item.oc.Microchip2", 25, 22, -.15f, 4500, true);//chip t3
+ new RackComponent("OpenComputers:item.oc.ALU", 10, 15, -.05f, 3000, true);//alu
+ new RackComponent("OpenComputers:item.oc.ControlUnit", 25, 18, -.05f, 1500, true);//cu
+
+ new RackComponent("OpenComputers:item.oc.ComponentBus0", 42, 30, -.05f, 1500, true);//bus t1
+ new RackComponent("OpenComputers:item.oc.ComponentBus1", 70, 50, -.1f, 3000, true);//bus t2
+ new RackComponent("OpenComputers:item.oc.ComponentBus2", 105, 72, -.15f, 4500, true);//bus t3
+
+ new RackComponent("OpenComputers:item.oc.CPU0", 106, 73, -.1f, 1500, true);//cpu t1
+ new RackComponent("OpenComputers:item.oc.CPU1", 226, 153, -.15f, 3000, true);//cpu t2
+ new RackComponent("OpenComputers:item.oc.CPU2", 374, 241, -.2f, 4500, true);//cpu t3
+
+ new RackComponent("OpenComputers:item.oc.GraphicsCard0", 20, 27, -.1f, 1500, true);//gpu t1
+ new RackComponent("OpenComputers:item.oc.GraphicsCard1", 62, 67, -.2f, 3000, true);//gpu t2
+ new RackComponent("OpenComputers:item.oc.GraphicsCard2", 130, 111, -.3f, 4500, true);//gpu t3
+
+ new RackComponent("OpenComputers:item.oc.APU0", 350, 234, -.1f, 1500, true);//apu t2
+ new RackComponent("OpenComputers:item.oc.APU1", 606, 398, -.2f, 4500, true);//apu t3
+ new RackComponent("OpenComputers:item.oc.APU2", 1590, 1006, -.3f, 9000, true);//apu tC
}
}