diff options
32 files changed, 187 insertions, 37 deletions
diff --git a/.classpath b/.classpath index 14cfcfbb21..956388a675 100644 --- a/.classpath +++ b/.classpath @@ -6,7 +6,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/Forge"/> <classpathentry kind="lib" path="E:/Development/KekzTech/libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar"/> <classpathentry kind="lib" path="libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar"/> - <classpathentry kind="lib" path="libs/gregtech-5.09.32-dev.jar"/> + <classpathentry kind="lib" path="libs/gregtech-5.09.32-dev.jar" sourcepath="libs/gregtech-5.09.32-dev-src.zip"/> <classpathentry kind="lib" path="libs/industrialcraft-2-2.2.828a-experimental-deobf.jar"/> <classpathentry kind="lib" path="libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar"/> <classpathentry kind="output" path="bin"/> diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock Binary files differindex ca3bbae07a..8d556d3686 100644 --- a/.gradle/2.0/taskArtifacts/cache.properties.lock +++ b/.gradle/2.0/taskArtifacts/cache.properties.lock diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin Binary files differindex c297a16654..91f9219747 100644 --- a/.gradle/2.0/taskArtifacts/fileHashes.bin +++ b/.gradle/2.0/taskArtifacts/fileHashes.bin diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin Binary files differindex 07f121e479..9af800bf56 100644 --- a/.gradle/2.0/taskArtifacts/fileSnapshots.bin +++ b/.gradle/2.0/taskArtifacts/fileSnapshots.bin diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin Binary files differindex 38ef8749f4..704a62e32f 100644 --- a/.gradle/2.0/taskArtifacts/taskArtifacts.bin +++ b/.gradle/2.0/taskArtifacts/taskArtifacts.bin diff --git a/config/IC2.ini b/config/IC2.ini index 25985da584..2bfdabd5ee 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config
-; created Jun 9, 2019 10:23:53 PM
+; created Jun 11, 2019 9:14:02 PM
;---
[worldgen]
diff --git a/config/splash.properties b/config/splash.properties index 9f6df603f4..f91453a5dc 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sun Jun 09 22:23:42 CEST 2019 +#Tue Jun 11 21:13:52 CEST 2019 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/crash-reports/crash-2019-06-11_21.12.00-client.txt b/crash-reports/crash-2019-06-11_21.12.00-client.txt new file mode 100644 index 0000000000..ab4a1b742f --- /dev/null +++ b/crash-reports/crash-2019-06-11_21.12.00-client.txt @@ -0,0 +1,135 @@ +---- Minecraft Crash Report ---- +// Don't do that. + +Time: 6/11/19 9:12 PM +Description: Initializing game + +java.lang.ClassCastException: gregtech.api.objects.ItemData cannot be cast to net.minecraft.item.ItemStack + at kekztech.KekzCore.postInit(KekzCore.java:202) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at cpw.mods.fml.common.FMLModContainer.handleModStateEvent(FMLModContainer.java:532) + at sun.reflect.GeneratedMethodAccessor7.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at com.google.common.eventbus.EventSubscriber.handleEvent(EventSubscriber.java:74) + at com.google.common.eventbus.SynchronizedEventSubscriber.handleEvent(SynchronizedEventSubscriber.java:47) + at com.google.common.eventbus.EventBus.dispatch(EventBus.java:322) + at com.google.common.eventbus.EventBus.dispatchQueuedEvents(EventBus.java:304) + at com.google.common.eventbus.EventBus.post(EventBus.java:275) + at cpw.mods.fml.common.LoadController.sendEventToModContainer(LoadController.java:212) + at cpw.mods.fml.common.LoadController.propogateStateMessage(LoadController.java:190) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at com.google.common.eventbus.EventSubscriber.handleEvent(EventSubscriber.java:74) + at com.google.common.eventbus.SynchronizedEventSubscriber.handleEvent(SynchronizedEventSubscriber.java:47) + at com.google.common.eventbus.EventBus.dispatch(EventBus.java:322) + at com.google.common.eventbus.EventBus.dispatchQueuedEvents(EventBus.java:304) + at com.google.common.eventbus.EventBus.post(EventBus.java:275) + at cpw.mods.fml.common.LoadController.distributeStateMessage(LoadController.java:119) + at cpw.mods.fml.common.Loader.initializeMods(Loader.java:742) + at cpw.mods.fml.client.FMLClientHandler.finishMinecraftLoading(FMLClientHandler.java:311) + at net.minecraft.client.Minecraft.startGame(Minecraft.java:597) + at net.minecraft.client.Minecraft.run(Minecraft.java:942) + at net.minecraft.client.main.Main.main(Main.java:164) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at net.minecraft.launchwrapper.Launch.launch(Launch.java:135) + at net.minecraft.launchwrapper.Launch.main(Launch.java:28) + at net.minecraftforge.gradle.GradleStartCommon.launch(Unknown Source) + at GradleStart.main(Unknown Source) + + +A detailed walkthrough of the error, its code path and all known details is as follows: +--------------------------------------------------------------------------------------- + +-- Head -- +Stacktrace: + at kekztech.KekzCore.postInit(KekzCore.java:202) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at cpw.mods.fml.common.FMLModContainer.handleModStateEvent(FMLModContainer.java:532) + at sun.reflect.GeneratedMethodAccessor7.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at com.google.common.eventbus.EventSubscriber.handleEvent(EventSubscriber.java:74) + at com.google.common.eventbus.SynchronizedEventSubscriber.handleEvent(SynchronizedEventSubscriber.java:47) + at com.google.common.eventbus.EventBus.dispatch(EventBus.java:322) + at com.google.common.eventbus.EventBus.dispatchQueuedEvents(EventBus.java:304) + at com.google.common.eventbus.EventBus.post(EventBus.java:275) + at cpw.mods.fml.common.LoadController.sendEventToModContainer(LoadController.java:212) + at cpw.mods.fml.common.LoadController.propogateStateMessage(LoadController.java:190) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at com.google.common.eventbus.EventSubscriber.handleEvent(EventSubscriber.java:74) + at com.google.common.eventbus.SynchronizedEventSubscriber.handleEvent(SynchronizedEventSubscriber.java:47) + at com.google.common.eventbus.EventBus.dispatch(EventBus.java:322) + at com.google.common.eventbus.EventBus.dispatchQueuedEvents(EventBus.java:304) + at com.google.common.eventbus.EventBus.post(EventBus.java:275) + at cpw.mods.fml.common.LoadController.distributeStateMessage(LoadController.java:119) + at cpw.mods.fml.common.Loader.initializeMods(Loader.java:742) + at cpw.mods.fml.client.FMLClientHandler.finishMinecraftLoading(FMLClientHandler.java:311) + at net.minecraft.client.Minecraft.startGame(Minecraft.java:597) + +-- Initialization -- +Details: +Stacktrace: + at net.minecraft.client.Minecraft.run(Minecraft.java:942) + at net.minecraft.client.main.Main.main(Main.java:164) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at net.minecraft.launchwrapper.Launch.launch(Launch.java:135) + at net.minecraft.launchwrapper.Launch.main(Launch.java:28) + at net.minecraftforge.gradle.GradleStartCommon.launch(Unknown Source) + at GradleStart.main(Unknown Source) + +-- System Details -- +Details: + Minecraft Version: 1.7.10 + Operating System: Windows 10 (amd64) version 10.0 + Java Version: 1.8.0_211, Oracle Corporation + Java VM Version: Java HotSpot(TM) 64-Bit Server VM (mixed mode), Oracle Corporation + Memory: 1105457376 bytes (1054 MB) / 1732771840 bytes (1652 MB) up to 3799515136 bytes (3623 MB) + JVM Flags: 0 total; + AABB Pool Size: 0 (0 bytes; 0 MB) allocated, 0 (0 bytes; 0 MB) used + IntCache: cache: 0, tcache: 0, allocated: 0, tallocated: 0 + FML: MCP v9.05 FML v7.10.99.99 Minecraft Forge 10.13.4.1614 10 mods loaded, 10 mods active + States: 'U' = Unloaded 'L' = Loaded 'C' = Constructed 'H' = Pre-initialized 'I' = Initialized 'J' = Post-initialized 'A' = Available 'D' = Disabled 'E' = Errored + UCHIJ mcp{9.05} [Minecraft Coder Pack] (minecraft.jar) + UCHIJ FML{7.10.99.99} [Forge Mod Loader] (forgeSrc-1.7.10-10.13.4.1614-1.7.10.jar) + UCHIJ Forge{10.13.4.1614} [Minecraft Forge] (forgeSrc-1.7.10-10.13.4.1614-1.7.10.jar) + UCHIJ NotEnoughItems{1.0.5.120} [Not Enough Items] (NotEnoughItems-1.7.10-1.0.5.120-dev.jar) + UCHIJ CodeChickenCore{1.0.7.47} [CodeChicken Core] (minecraft.jar) + UCHIJ IC2{2.2.828-experimental} [IndustrialCraft 2] (industrialcraft-2-2.2.828a-experimental-deobf.jar) + UCHIJ gregtech{MC1710} [GregTech] (gregtech-5.09.32-dev.jar) + UCHIE kekztech{0.1a} [KekzTech] (bin) + UCHIJ examplemod{1.0} [Example Mod] (bin) + UCHIJ devtips{1.1} [DevTooltips] (devtips-1.1.jar) + GL info: ' Vendor: 'NVIDIA Corporation' Version: '4.6.0 NVIDIA 398.36' Renderer: 'GeForce GTX 970/PCIe/SSE2' + Launched Version: 1.7.10 + LWJGL: 2.9.1 + OpenGL: GeForce GTX 970/PCIe/SSE2 GL version 4.6.0 NVIDIA 398.36, NVIDIA Corporation + GL Caps: Using GL 1.3 multitexturing. +Using framebuffer objects because OpenGL 3.0 is supported and separate blending is supported. +Anisotropic filtering is supported and maximum anisotropy is 16. +Shaders are available because OpenGL 2.1 is supported. + + Is Modded: Definitely; Client brand changed to 'fml,forge' + Type: Client (map_client.txt) + Resource Packs: [] + Current Language: English (US) + Profiler Position: N/A (disabled) + Vec3 Pool Size: 0 (0 bytes; 0 MB) allocated, 0 (0 bytes; 0 MB) used + Anisotropic Filtering: Off (1)
\ No newline at end of file diff --git a/logs/2019-06-09-1.log.gz b/logs/2019-06-09-1.log.gz Binary files differindex 543151b65c..e4ac076134 100644 --- a/logs/2019-06-09-1.log.gz +++ b/logs/2019-06-09-1.log.gz diff --git a/logs/2019-06-09-2.log.gz b/logs/2019-06-09-2.log.gz Binary files differindex e4ac076134..90b204a53f 100644 --- a/logs/2019-06-09-2.log.gz +++ b/logs/2019-06-09-2.log.gz diff --git a/logs/2019-06-09-3.log.gz b/logs/2019-06-09-3.log.gz Binary files differindex 90b204a53f..a32627c915 100644 --- a/logs/2019-06-09-3.log.gz +++ b/logs/2019-06-09-3.log.gz diff --git a/logs/2019-06-09-4.log.gz b/logs/2019-06-09-4.log.gz Binary files differindex a32627c915..525ac02f16 100644 --- a/logs/2019-06-09-4.log.gz +++ b/logs/2019-06-09-4.log.gz diff --git a/logs/2019-06-09-5.log.gz b/logs/2019-06-09-5.log.gz Binary files differindex 525ac02f16..e5f2d4cc1a 100644 --- a/logs/2019-06-09-5.log.gz +++ b/logs/2019-06-09-5.log.gz diff --git a/logs/2019-06-09-6.log.gz b/logs/2019-06-09-6.log.gz Binary files differindex e5f2d4cc1a..69d1687129 100644 --- a/logs/2019-06-09-6.log.gz +++ b/logs/2019-06-09-6.log.gz diff --git a/logs/2019-06-09-7.log.gz b/logs/2019-06-09-7.log.gz Binary files differindex 69d1687129..e3cfa93b16 100644 --- a/logs/2019-06-09-7.log.gz +++ b/logs/2019-06-09-7.log.gz diff --git a/logs/2019-06-11-1.log.gz b/logs/2019-06-11-1.log.gz Binary files differnew file mode 100644 index 0000000000..25893e1779 --- /dev/null +++ b/logs/2019-06-11-1.log.gz diff --git a/logs/2019-06-11-2.log.gz b/logs/2019-06-11-2.log.gz Binary files differnew file mode 100644 index 0000000000..4e798dc328 --- /dev/null +++ b/logs/2019-06-11-2.log.gz diff --git a/logs/2019-06-11-3.log.gz b/logs/2019-06-11-3.log.gz Binary files differnew file mode 100644 index 0000000000..7cd1086b6e --- /dev/null +++ b/logs/2019-06-11-3.log.gz diff --git a/saves/NEI/local/New World/NEI.dat b/saves/NEI/local/New World/NEI.dat Binary files differindex b3ccd4a6d1..448ff32f0b 100644 --- a/saves/NEI/local/New World/NEI.dat +++ b/saves/NEI/local/New World/NEI.dat diff --git a/saves/New World/DIM-1/data/villages.dat b/saves/New World/DIM-1/data/villages.dat Binary files differindex 4ed56e2a59..b217d6334f 100644 --- a/saves/New World/DIM-1/data/villages.dat +++ b/saves/New World/DIM-1/data/villages.dat diff --git a/saves/New World/DIM1/data/villages.dat b/saves/New World/DIM1/data/villages.dat Binary files differindex 4ed56e2a59..b217d6334f 100644 --- a/saves/New World/DIM1/data/villages.dat +++ b/saves/New World/DIM1/data/villages.dat diff --git a/saves/New World/data/villages.dat b/saves/New World/data/villages.dat Binary files differindex 4ed56e2a59..b217d6334f 100644 --- a/saves/New World/data/villages.dat +++ b/saves/New World/data/villages.dat diff --git a/saves/New World/level.dat b/saves/New World/level.dat Binary files differindex feb43f13c9..75a864b1cf 100644 --- a/saves/New World/level.dat +++ b/saves/New World/level.dat diff --git a/saves/New World/level.dat_old b/saves/New World/level.dat_old Binary files differindex 10f912a565..a4c90146a6 100644 --- a/saves/New World/level.dat_old +++ b/saves/New World/level.dat_old diff --git a/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat b/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat Binary files differindex e25471937d..c97b947a00 100644 --- a/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat +++ b/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat diff --git a/saves/New World/region/r.0.-1.mca b/saves/New World/region/r.0.-1.mca Binary files differindex d22e6a9d68..477bd7298b 100644 --- a/saves/New World/region/r.0.-1.mca +++ b/saves/New World/region/r.0.-1.mca diff --git a/saves/New World/region/r.0.0.mca b/saves/New World/region/r.0.0.mca Binary files differindex 8b85498855..907b692fe5 100644 --- a/saves/New World/region/r.0.0.mca +++ b/saves/New World/region/r.0.0.mca diff --git a/saves/New World/session.lock b/saves/New World/session.lock Binary files differindex 8344b49a8d..9232f2d4b4 100644 --- a/saves/New World/session.lock +++ b/saves/New World/session.lock diff --git a/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json b/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json index 4c6b06441c..8e34a51d31 100644 --- a/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json +++ b/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json @@ -1 +1 @@ -{"stat.flyOneCm":36091,"stat.walkOneCm":164961,"stat.jump":230,"stat.playOneMinute":402943,"achievement.openInventory":169,"stat.climbOneCm":1022,"stat.leaveGame":1,"stat.useItem.3":43,"achievement.exploreAllBiomes":{"value":0,"progress":["Swampland"]}}
\ No newline at end of file +{"stat.flyOneCm":39340,"stat.walkOneCm":170980,"stat.jump":241,"stat.playOneMinute":410701,"achievement.openInventory":174,"stat.climbOneCm":1819,"stat.leaveGame":1,"stat.useItem.3":43,"achievement.exploreAllBiomes":{"value":0,"progress":["Swampland"]}}
\ No newline at end of file diff --git a/src/main/java/items/ErrorItem.java b/src/main/java/items/ErrorItem.java index 5694b4e800..e622197565 100644 --- a/src/main/java/items/ErrorItem.java +++ b/src/main/java/items/ErrorItem.java @@ -34,8 +34,9 @@ public class ErrorItem extends Item { @SuppressWarnings({"unchecked", "rawtypes"}) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { + list.add("REMINDER: KekzTech recipes are only confirmed to work in GTNH!"); list.add("Placeholder item in case something went wrong"); - list.add("You may report this to:"); + list.add("If this item shows up in GTNH, you may report it to:"); list.add("https://github.com/kekzdealer/KekzTech"); } diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index bb65090625..2eda746852 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -10,6 +10,9 @@ import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import items.ErrorItem; import items.MetaItem_CraftingComponent; @@ -64,29 +67,33 @@ public class KekzCore { final MetaItem_ReactorComponent reactorItem = MetaItem_ReactorComponent.getInstance(); // Multiblock Controllers - GameRegistry.addShapedRecipe(sofc1.getStackForm(1), + final Object[] mk1_recipe = { "CCC", "PHP", "FBL", - 'C', Util.getStackofAmountFromOreDict("circuitAdvanced", 1), + 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', ItemList.Electric_Pump_HV.get(1L, (Object[]) null), 'H', ItemList.Hull_HV.get(1L, (Object[]) null), - 'F', Util.getStackofAmountFromOreDict("pipeSmallStainlessSteel", 1), - 'B', Util.getStackofAmountFromOreDict("cableGt02Gold", 1), - 'L', Util.getStackofAmountFromOreDict("pipeLargeStainlessSteel", 1)); - GameRegistry.addShapedRecipe(sofc2.getStackForm(1), + 'F', GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.StainlessSteel, 1), + 'B', GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Gold, 1), + 'L', GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1) + }; + GT_ModHandler.addCraftingRecipe(sofc1.getStackForm(1), mk1_recipe); + final Object[] mk2_recipe = { "CCC", "PHP", "FBL", - 'C', Util.getStackofAmountFromOreDict("circuitMaster", 1), + 'C', OrePrefixes.circuit.get(Materials.Master), 'P', ItemList.Electric_Pump_IV.get(1L, (Object[]) null), 'H', ItemList.Hull_IV.get(1L, (Object[]) null), - 'F', Util.getStackofAmountFromOreDict("pipeSmallUltimate", 1), + 'F', GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1), 'B', Util.getStackofAmountFromOreDict("wireGt04SuperconductorEV", 1), - 'L', Util.getStackofAmountFromOreDict("pipeMediumUltimate", 1)); + 'L', GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 1) + }; + GT_ModHandler.addCraftingRecipe(sofc2.getStackForm(1), mk2_recipe); // Ceramic Electrolyte Units final ItemStack[] yszUnit = { GT_Utility.getIntegratedCircuit(6), craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 4), - Util.getStackofAmountFromOreDict("frameGtYttrium", 1), - Util.getStackofAmountFromOreDict("rotorStainlessSteel", 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Yttrium, 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1), ItemList.Electric_Motor_HV.get(1L, (Object[]) null), }; GT_Values.RA.addAssemblerRecipe( @@ -97,8 +104,8 @@ public class KekzCore { final ItemStack[] gdcUnit = { GT_Utility.getIntegratedCircuit(6), craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 8), - Util.getStackofAmountFromOreDict("frameGtGadolinium", 1), - Util.getStackofAmountFromOreDict("rotorDesh", 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, new ItemStack(ErrorItem.getInstance(), 1), 1), ItemList.Electric_Motor_IV.get(1L, (Object[]) null), }; GT_Values.RA.addAssemblerRecipe( @@ -138,10 +145,6 @@ public class KekzCore { null, craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondDust.getMetaID(), 1), null, 1200, 480); - GT_Values.RA.addAutoclaveRecipe( - craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondDust.getMetaID(), 4), - Materials.CarbonDioxide.getGas(16000), - craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondCrystal.getMetaID(), 1), 10000, 2400, 7680); GT_Values.RA.addChemicalRecipe( Materials.Yttrium.getDust(1), GT_Utility.getIntegratedCircuit(6), Materials.Oxygen.getGas(3000), null, craftingItem.getStackOfAmountFromDamage(Items.YttriaDust.getMetaID(), 1), null, @@ -161,19 +164,29 @@ public class KekzCore { craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 6), 400, 96); GT_Values.RA.addMixerRecipe( - Util.getStackofAmountFromOreDict("dustGadolinium", 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1), craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 9), GT_Utility.getIntegratedCircuit(6), null, null, null, craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10), 400, 1920); + // Crystals + GT_Values.RA.addAutoclaveRecipe( + craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondDust.getMetaID(), 4), + Materials.CarbonDioxide.getGas(16000), + craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondCrystal.getMetaID(), 1), 10000, 2400, 7680); + GT_Values.RA.addAutoclaveRecipe( + craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondDust.getMetaID(), 4), + Materials.CarbonDioxide.getGas(16000), + craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondCrystal.getMetaID(), 1), 10000, 2400, 1920); + // Heat Pipes GT_Values.RA.addLatheRecipe( - Util.getStackofAmountFromOreDict("stickCopper", 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.AnnealedCopper, 1), craftingItem.getStackFromDamage(Items.CopperHeatPipe.getMetaID()), null, 120, 120); GT_Values.RA.addLatheRecipe( - Util.getStackofAmountFromOreDict("stickSilver", 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Silver, 1), craftingItem.getStackFromDamage(Items.SilverHeatPipe.getMetaID()), null, 120, 480); GT_Values.RA.addLatheRecipe( @@ -189,10 +202,10 @@ public class KekzCore { final ItemStack[] t1HeatVent = { craftingItem.getStackOfAmountFromDamage(Items.CopperHeatPipe.getMetaID(), 2), ItemList.Electric_Motor_MV.get(1L, (Object[]) null), - Util.getStackofAmountFromOreDict("rotorSteel", 1), - Util.getStackofAmountFromOreDict("plateDoubleSteel", 2), - Util.getStackofAmountFromOreDict("screwSteel", 8), - Util.getStackofAmountFromOreDict("circuitGood", 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, new ItemStack(ErrorItem.getInstance(), 1), 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, new ItemStack(ErrorItem.getInstance(), 1), 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, new ItemStack(ErrorItem.getInstance(), 1), 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), GT_Utility.getIntegratedCircuit(6) }; GT_Values.RA.addAssemblerRecipe( @@ -203,10 +216,10 @@ public class KekzCore { final ItemStack[] t2HeatVent = { craftingItem.getStackOfAmountFromDamage(Items.SilverHeatPipe.getMetaID(), 2), ItemList.Electric_Motor_HV.get(1L, (Object[]) null), - Util.getStackofAmountFromOreDict("rotorAluminium", 1), - Util.getStackofAmountFromOreDict("plateDoubleAluminium", 2), - Util.getStackofAmountFromOreDict("screwAluminium", 8), - Util.getStackofAmountFromOreDict("circuitAdvanced", 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, new ItemStack(ErrorItem.getInstance(), 1), 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, new ItemStack(ErrorItem.getInstance(), 1), 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Aluminium, new ItemStack(ErrorItem.getInstance(), 1), 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), GT_Utility.getIntegratedCircuit(6) }; GT_Values.RA.addAssemblerRecipe( @@ -217,10 +230,10 @@ public class KekzCore { final ItemStack[] t3HeatVent = { craftingItem.getStackOfAmountFromDamage(Items.BoronArsenideHeatPipe.getMetaID(), 2), ItemList.Electric_Motor_IV.get(1L, (Object[]) null), - Util.getStackofAmountFromOreDict("rotorTungstenSteel", 1), - Util.getStackofAmountFromOreDict("plateDoubleTungstenSteel", 2), - Util.getStackofAmountFromOreDict("screwTungsten", 8), - Util.getStackofAmountFromOreDict("circuitData", 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, new ItemStack(ErrorItem.getInstance(), 1), 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, new ItemStack(ErrorItem.getInstance(), 1), 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tungsten, new ItemStack(ErrorItem.getInstance(), 1), 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1), GT_Utility.getIntegratedCircuit(6) }; GT_Values.RA.addAssemblerRecipe( diff --git a/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java index c4a54ec472..e775f7bbfb 100644 --- a/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java +++ b/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java @@ -39,6 +39,7 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas @Override public String[] getDescription() { return new String[] { + "DO NOT CHEAT IN THIS MACHINE", "I'm not quite finished yet", "------------------------------------------", "Dimensions: 5x5x5 (WxHxL)", |