From e806e19f3b42df2759231880afff02648908239f Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sun, 9 Jun 2019 23:41:14 +0200 Subject: gradle building and recipes. SOFC fully functional. Probably first release :) --- .classpath | 10 +- .gradle/2.0/taskArtifacts/cache.properties | 1 + .gradle/2.0/taskArtifacts/cache.properties.lock | Bin 0 -> 17 bytes .gradle/2.0/taskArtifacts/fileHashes.bin | Bin 0 -> 87690 bytes .gradle/2.0/taskArtifacts/fileSnapshots.bin | Bin 0 -> 66345 bytes .gradle/2.0/taskArtifacts/outputFileStates.bin | Bin 0 -> 18722 bytes .gradle/2.0/taskArtifacts/taskArtifacts.bin | Bin 0 -> 21129 bytes build.gradle | 2 + config/GregTech/Recipes.cfg | 17 ++ config/IC2.ini | 2 +- config/splash.properties | 2 +- crash-reports/crash-2019-06-09_18.36.52-client.txt | 139 ++++++++++ crash-reports/crash-2019-06-09_18.40.05-client.txt | 139 ++++++++++ gradle/wrapper/gradle-wrapper.properties | 6 + lib/MACHINE_CASING_VENT.png | Bin 467 -> 0 bytes logs/2019-06-08-1.log.gz | Bin 680 -> 713 bytes logs/2019-06-08-2.log.gz | Bin 685 -> 663 bytes logs/2019-06-08-3.log.gz | Bin 658 -> 672 bytes logs/2019-06-08-4.log.gz | Bin 713 -> 663 bytes logs/2019-06-08-5.log.gz | Bin 663 -> 880 bytes logs/2019-06-08-6.log.gz | Bin 672 -> 683 bytes logs/2019-06-08-7.log.gz | Bin 663 -> 686 bytes logs/2019-06-09-1.log.gz | Bin 0 -> 618 bytes logs/2019-06-09-2.log.gz | Bin 0 -> 666 bytes logs/2019-06-09-3.log.gz | Bin 0 -> 319 bytes logs/2019-06-09-4.log.gz | Bin 0 -> 318 bytes logs/2019-06-09-5.log.gz | Bin 0 -> 702 bytes logs/2019-06-09-6.log.gz | Bin 0 -> 2801 bytes logs/2019-06-09-7.log.gz | Bin 0 -> 1313 bytes options.txt | 2 +- saves/NEI/local/New World/NEI.dat | Bin 94 -> 88 bytes saves/New World/DIM-1/data/villages.dat | Bin 56 -> 56 bytes saves/New World/DIM1/data/villages.dat | Bin 56 -> 56 bytes saves/New World/data/villages.dat | Bin 56 -> 56 bytes saves/New World/level.dat | Bin 14458 -> 14520 bytes saves/New World/level.dat_old | Bin 14458 -> 14519 bytes .../ddc68fe4-0789-360b-a837-3dcbb936da65.dat | Bin 707 -> 767 bytes saves/New World/region/r.0.-1.mca | Bin 1671168 -> 1671168 bytes saves/New World/region/r.0.0.mca | Bin 2461696 -> 2461696 bytes saves/New World/session.lock | Bin 8 -> 8 bytes .../ddc68fe4-0789-360b-a837-3dcbb936da65.json | 2 +- src/main/java/blocks/Block_GDCUnit.java | 29 +++ src/main/java/blocks/Block_YSZUnit.java | 29 +++ .../container/Container_ModularNuclearReactor.java | 70 +++++ .../GUIContainer_ModularNuclearReactor.java | 53 ++++ src/main/java/fuelcell/Block_GDCUnit.java | 29 --- src/main/java/fuelcell/Block_YSZUnit.java | 29 --- src/main/java/fuelcell/GTMTE_SOFuelCellMK1.java | 233 ----------------- src/main/java/fuelcell/GTMTE_SOFuelCellMK2.java | 226 ---------------- src/main/java/items/ErrorItem.java | 42 +++ .../java/items/MetaItem_CraftingComponent.java | 103 ++++++++ src/main/java/items/MetaItem_ReactorComponent.java | 140 ++++++++++ src/main/java/kekztech/ErrorItem.java | 41 --- src/main/java/kekztech/GTMultiController.java | 5 + src/main/java/kekztech/Items.java | 7 +- src/main/java/kekztech/KekzCore.java | 202 +++++++++++++-- .../java/kekztech/MetaItem_CraftingComponent.java | 103 -------- .../java/kekztech/MetaItem_ReactorComponent.java | 139 ---------- src/main/java/kekztech/Util.java | 1 + .../reactor/Container_ModularNuclearReactor.java | 68 ----- .../java/reactor/GTMTE_ModularNuclearReactor.java | 183 ------------- .../GUIContainer_ModularNuclearReactor.java | 53 ---- src/main/java/reactor/items/CoolantCell.java | 2 +- src/main/java/reactor/items/FuelRod.java | 2 +- src/main/java/reactor/items/HeatExchanger.java | 4 +- src/main/java/reactor/items/HeatPipe.java | 29 --- src/main/java/reactor/items/HeatVent.java | 4 +- src/main/java/reactor/items/NeutronReflector.java | 2 +- .../tileentities/GTMTE_ModularNuclearReactor.java | 185 ++++++++++++++ .../java/tileentities/GTMTE_SOFuelCellMK1.java | 284 +++++++++++++++++++++ .../java/tileentities/GTMTE_SOFuelCellMK2.java | 283 ++++++++++++++++++++ 71 files changed, 1729 insertions(+), 1173 deletions(-) create mode 100644 .gradle/2.0/taskArtifacts/cache.properties create mode 100644 .gradle/2.0/taskArtifacts/cache.properties.lock create mode 100644 .gradle/2.0/taskArtifacts/fileHashes.bin create mode 100644 .gradle/2.0/taskArtifacts/fileSnapshots.bin create mode 100644 .gradle/2.0/taskArtifacts/outputFileStates.bin create mode 100644 .gradle/2.0/taskArtifacts/taskArtifacts.bin create mode 100644 crash-reports/crash-2019-06-09_18.36.52-client.txt create mode 100644 crash-reports/crash-2019-06-09_18.40.05-client.txt create mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100644 lib/MACHINE_CASING_VENT.png create mode 100644 logs/2019-06-09-1.log.gz create mode 100644 logs/2019-06-09-2.log.gz create mode 100644 logs/2019-06-09-3.log.gz create mode 100644 logs/2019-06-09-4.log.gz create mode 100644 logs/2019-06-09-5.log.gz create mode 100644 logs/2019-06-09-6.log.gz create mode 100644 logs/2019-06-09-7.log.gz create mode 100644 src/main/java/blocks/Block_GDCUnit.java create mode 100644 src/main/java/blocks/Block_YSZUnit.java create mode 100644 src/main/java/container/Container_ModularNuclearReactor.java create mode 100644 src/main/java/container/GUIContainer_ModularNuclearReactor.java delete mode 100644 src/main/java/fuelcell/Block_GDCUnit.java delete mode 100644 src/main/java/fuelcell/Block_YSZUnit.java delete mode 100644 src/main/java/fuelcell/GTMTE_SOFuelCellMK1.java delete mode 100644 src/main/java/fuelcell/GTMTE_SOFuelCellMK2.java create mode 100644 src/main/java/items/ErrorItem.java create mode 100644 src/main/java/items/MetaItem_CraftingComponent.java create mode 100644 src/main/java/items/MetaItem_ReactorComponent.java delete mode 100644 src/main/java/kekztech/ErrorItem.java delete mode 100644 src/main/java/kekztech/MetaItem_CraftingComponent.java delete mode 100644 src/main/java/kekztech/MetaItem_ReactorComponent.java delete mode 100644 src/main/java/reactor/Container_ModularNuclearReactor.java delete mode 100644 src/main/java/reactor/GTMTE_ModularNuclearReactor.java delete mode 100644 src/main/java/reactor/GUIContainer_ModularNuclearReactor.java delete mode 100644 src/main/java/reactor/items/HeatPipe.java create mode 100644 src/main/java/tileentities/GTMTE_ModularNuclearReactor.java create mode 100644 src/main/java/tileentities/GTMTE_SOFuelCellMK1.java create mode 100644 src/main/java/tileentities/GTMTE_SOFuelCellMK2.java diff --git a/.classpath b/.classpath index 580a8e91c4..14cfcfbb21 100644 --- a/.classpath +++ b/.classpath @@ -4,10 +4,10 @@ - - - - - + + + + + diff --git a/.gradle/2.0/taskArtifacts/cache.properties b/.gradle/2.0/taskArtifacts/cache.properties new file mode 100644 index 0000000000..0a27f00048 --- /dev/null +++ b/.gradle/2.0/taskArtifacts/cache.properties @@ -0,0 +1 @@ +#Sun Jun 09 22:52:57 CEST 2019 diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock new file mode 100644 index 0000000000..ca3bbae07a Binary files /dev/null and b/.gradle/2.0/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin new file mode 100644 index 0000000000..c297a16654 Binary files /dev/null and b/.gradle/2.0/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin new file mode 100644 index 0000000000..07f121e479 Binary files /dev/null and b/.gradle/2.0/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin new file mode 100644 index 0000000000..33e592204a Binary files /dev/null and b/.gradle/2.0/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin new file mode 100644 index 0000000000..38ef8749f4 Binary files /dev/null and b/.gradle/2.0/taskArtifacts/taskArtifacts.bin differ diff --git a/build.gradle b/build.gradle index 0306dde268..1a154c453c 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,8 @@ buildscript { } apply plugin: 'forge' +sourceCompatibility = 1.8 +targetCompatibility = 1.8 version = "0.1" group= "kekztech" // http://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/config/GregTech/Recipes.cfg b/config/GregTech/Recipes.cfg index 9033b90669..25bb16c96b 100644 --- a/config/GregTech/Recipes.cfg +++ b/config/GregTech/Recipes.cfg @@ -323,6 +323,7 @@ alloysmelting { I:ingotYttrium_200=200 I:ingotZinc_130=130 I:ingotZinc_200=200 + I:item.kekztech_crafting_item.14_400=400 I:nuggetAluminium_100=100 I:nuggetAluminium_130=130 I:nuggetAmericium_100=100 @@ -4630,6 +4631,9 @@ assembling { I:tile.furnace_400=400 I:tile.hopper_800=800 I:tile.jukebox_400=400 + I:tile.kekztech_gdcceramicelectrolyteunit_block_2400=2400 + I:tile.kekztech_yszceramicelectrolyteunit_block_1200=1200 + I:tile.kekztech_yszceramicelectrolyteunit_block_2400=2400 I:tile.lever_400=400 I:tile.musicBlock_200=200 I:tile.netherFence_100=100 @@ -4994,6 +4998,8 @@ autoclave { I:gt.metaitem.02.32540_19200=19200 I:ic2.itemDustenergium_250=250 I:ic2.itemDustenergium_500=500 + I:item.kekztech_crafting_item.5_2400=2400 + I:item.kekztech_crafting_item.5_7680=7680 } @@ -6880,6 +6886,12 @@ chemicalreactor { I:isoprene_120=120 I:item.appleGold_50=50 I:item.carrotGolden_50=50 + I:item.kekztech_crafting_item.11_400=400 + I:item.kekztech_crafting_item.12_400=400 + I:item.kekztech_crafting_item.13_400=400 + I:item.kekztech_crafting_item.5_1=1 + I:item.kekztech_crafting_item.5_1200=1200 + I:item.kekztech_crafting_item.6_400=400 I:item.magmaCream_50=50 I:item.speckledMelon_50=50 I:leadzincsolution_50=50 @@ -20671,6 +20683,9 @@ mixer { I:ic2biomass_400=400 I:ic2coolant_256=256 I:item.fermentedSpiderEye_100=100 + I:item.kekztech_crafting_item.10_400=400 + I:item.kekztech_crafting_item.4_100=100 + I:item.kekztech_crafting_item.9_400=400 I:liquid_drillingfluid_64=64 I:liquid_nitrationmixture_480=480 I:molten.concrete_20=20 @@ -21085,6 +21100,8 @@ press { I:gt.metaitem.02.32563_384=384 I:gt.metaitem.02.32569_384=384 I:ic2.itemCoin_100=100 + I:item.kekztech_crafting_item.14_800=800 + I:item.kekztech_crafting_item.15_800=800 } diff --git a/config/IC2.ini b/config/IC2.ini index 6af543ae7f..25985da584 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config -; created Jun 8, 2019 9:40:58 PM +; created Jun 9, 2019 10:23:53 PM ;--- [worldgen] diff --git a/config/splash.properties b/config/splash.properties index 6b7594e1ce..9f6df603f4 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sat Jun 08 21:40:49 CEST 2019 +#Sun Jun 09 22:23:42 CEST 2019 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/crash-reports/crash-2019-06-09_18.36.52-client.txt b/crash-reports/crash-2019-06-09_18.36.52-client.txt new file mode 100644 index 0000000000..d7f5e9b6cf --- /dev/null +++ b/crash-reports/crash-2019-06-09_18.36.52-client.txt @@ -0,0 +1,139 @@ +---- Minecraft Crash Report ---- +// Shall we play a game? + +Time: 6/9/19 6:36 PM +Description: Initializing game + +java.lang.ClassCastException: net.minecraft.item.ItemStack cannot be cast to java.lang.Character + at net.minecraft.item.crafting.CraftingManager.addRecipe(CraftingManager.java:209) + at cpw.mods.fml.common.registry.GameRegistry.addShapedRecipe(GameRegistry.java:250) + at kekztech.KekzCore.postInit(KekzCore.java:64) + 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 net.minecraft.item.crafting.CraftingManager.addRecipe(CraftingManager.java:209) + at cpw.mods.fml.common.registry.GameRegistry.addShapedRecipe(GameRegistry.java:250) + at kekztech.KekzCore.postInit(KekzCore.java:64) + 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: 1162024768 bytes (1108 MB) / 1618477056 bytes (1543 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/crash-reports/crash-2019-06-09_18.40.05-client.txt b/crash-reports/crash-2019-06-09_18.40.05-client.txt new file mode 100644 index 0000000000..422255c54d --- /dev/null +++ b/crash-reports/crash-2019-06-09_18.40.05-client.txt @@ -0,0 +1,139 @@ +---- Minecraft Crash Report ---- +// My bad. + +Time: 6/9/19 6:40 PM +Description: Initializing game + +java.lang.ClassCastException: net.minecraft.item.ItemStack cannot be cast to java.lang.Character + at net.minecraft.item.crafting.CraftingManager.addRecipe(CraftingManager.java:209) + at cpw.mods.fml.common.registry.GameRegistry.addShapedRecipe(GameRegistry.java:250) + at kekztech.KekzCore.postInit(KekzCore.java:64) + 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 net.minecraft.item.crafting.CraftingManager.addRecipe(CraftingManager.java:209) + at cpw.mods.fml.common.registry.GameRegistry.addShapedRecipe(GameRegistry.java:250) + at kekztech.KekzCore.postInit(KekzCore.java:64) + 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: 924043544 bytes (881 MB) / 1652031488 bytes (1575 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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..678d9d8de3 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Jul 02 15:54:47 CDT 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/lib/MACHINE_CASING_VENT.png b/lib/MACHINE_CASING_VENT.png deleted file mode 100644 index 6d9fb32d7e..0000000000 Binary files a/lib/MACHINE_CASING_VENT.png and /dev/null differ diff --git a/logs/2019-06-08-1.log.gz b/logs/2019-06-08-1.log.gz index 0c7f2f3cad..1b3dc7304d 100644 Binary files a/logs/2019-06-08-1.log.gz and b/logs/2019-06-08-1.log.gz differ diff --git a/logs/2019-06-08-2.log.gz b/logs/2019-06-08-2.log.gz index c768eb63ff..46c003444c 100644 Binary files a/logs/2019-06-08-2.log.gz and b/logs/2019-06-08-2.log.gz differ diff --git a/logs/2019-06-08-3.log.gz b/logs/2019-06-08-3.log.gz index dac783178f..60ea60d661 100644 Binary files a/logs/2019-06-08-3.log.gz and b/logs/2019-06-08-3.log.gz differ diff --git a/logs/2019-06-08-4.log.gz b/logs/2019-06-08-4.log.gz index 1b3dc7304d..4af0292995 100644 Binary files a/logs/2019-06-08-4.log.gz and b/logs/2019-06-08-4.log.gz differ diff --git a/logs/2019-06-08-5.log.gz b/logs/2019-06-08-5.log.gz index 46c003444c..587f29e5b7 100644 Binary files a/logs/2019-06-08-5.log.gz and b/logs/2019-06-08-5.log.gz differ diff --git a/logs/2019-06-08-6.log.gz b/logs/2019-06-08-6.log.gz index 60ea60d661..b5f0576dc9 100644 Binary files a/logs/2019-06-08-6.log.gz and b/logs/2019-06-08-6.log.gz differ diff --git a/logs/2019-06-08-7.log.gz b/logs/2019-06-08-7.log.gz index 4af0292995..08d49fa2e9 100644 Binary files a/logs/2019-06-08-7.log.gz and b/logs/2019-06-08-7.log.gz differ diff --git a/logs/2019-06-09-1.log.gz b/logs/2019-06-09-1.log.gz new file mode 100644 index 0000000000..543151b65c Binary files /dev/null and b/logs/2019-06-09-1.log.gz differ diff --git a/logs/2019-06-09-2.log.gz b/logs/2019-06-09-2.log.gz new file mode 100644 index 0000000000..e4ac076134 Binary files /dev/null and b/logs/2019-06-09-2.log.gz differ diff --git a/logs/2019-06-09-3.log.gz b/logs/2019-06-09-3.log.gz new file mode 100644 index 0000000000..90b204a53f Binary files /dev/null and b/logs/2019-06-09-3.log.gz differ diff --git a/logs/2019-06-09-4.log.gz b/logs/2019-06-09-4.log.gz new file mode 100644 index 0000000000..a32627c915 Binary files /dev/null and b/logs/2019-06-09-4.log.gz differ diff --git a/logs/2019-06-09-5.log.gz b/logs/2019-06-09-5.log.gz new file mode 100644 index 0000000000..525ac02f16 Binary files /dev/null and b/logs/2019-06-09-5.log.gz differ diff --git a/logs/2019-06-09-6.log.gz b/logs/2019-06-09-6.log.gz new file mode 100644 index 0000000000..e5f2d4cc1a Binary files /dev/null and b/logs/2019-06-09-6.log.gz differ diff --git a/logs/2019-06-09-7.log.gz b/logs/2019-06-09-7.log.gz new file mode 100644 index 0000000000..69d1687129 Binary files /dev/null and b/logs/2019-06-09-7.log.gz differ diff --git a/options.txt b/options.txt index 15bd4c3fa1..8c305b8fca 100644 --- a/options.txt +++ b/options.txt @@ -63,7 +63,7 @@ key_key.jump:57 key_key.sneak:42 key_key.drop:16 key_key.inventory:18 -key_key.chat:20 +key_key.chat:28 key_key.playerlist:15 key_key.pickItem:-98 key_key.command:53 diff --git a/saves/NEI/local/New World/NEI.dat b/saves/NEI/local/New World/NEI.dat index 78398249ba..b3ccd4a6d1 100644 Binary files a/saves/NEI/local/New World/NEI.dat and b/saves/NEI/local/New World/NEI.dat differ diff --git a/saves/New World/DIM-1/data/villages.dat b/saves/New World/DIM-1/data/villages.dat index 5d76e45ff5..4ed56e2a59 100644 Binary files a/saves/New World/DIM-1/data/villages.dat and b/saves/New World/DIM-1/data/villages.dat differ diff --git a/saves/New World/DIM1/data/villages.dat b/saves/New World/DIM1/data/villages.dat index 5d76e45ff5..4ed56e2a59 100644 Binary files a/saves/New World/DIM1/data/villages.dat and b/saves/New World/DIM1/data/villages.dat differ diff --git a/saves/New World/data/villages.dat b/saves/New World/data/villages.dat index 5d76e45ff5..4ed56e2a59 100644 Binary files a/saves/New World/data/villages.dat and b/saves/New World/data/villages.dat differ diff --git a/saves/New World/level.dat b/saves/New World/level.dat index ba932fedde..feb43f13c9 100644 Binary files a/saves/New World/level.dat and b/saves/New World/level.dat differ diff --git a/saves/New World/level.dat_old b/saves/New World/level.dat_old index a57d9f0822..10f912a565 100644 Binary files a/saves/New World/level.dat_old and b/saves/New World/level.dat_old differ diff --git a/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat b/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat index 626bfb821a..e25471937d 100644 Binary files a/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat and b/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat differ diff --git a/saves/New World/region/r.0.-1.mca b/saves/New World/region/r.0.-1.mca index 63d250f81e..d22e6a9d68 100644 Binary files a/saves/New World/region/r.0.-1.mca and b/saves/New World/region/r.0.-1.mca differ diff --git a/saves/New World/region/r.0.0.mca b/saves/New World/region/r.0.0.mca index 1d982b8af4..8b85498855 100644 Binary files a/saves/New World/region/r.0.0.mca and b/saves/New World/region/r.0.0.mca differ diff --git a/saves/New World/session.lock b/saves/New World/session.lock index 618a7fd07a..8344b49a8d 100644 Binary files a/saves/New World/session.lock and b/saves/New World/session.lock differ 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 4e6e96c4e1..4c6b06441c 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":21194,"stat.walkOneCm":75824,"stat.jump":106,"stat.playOneMinute":323993,"achievement.openInventory":102,"stat.climbOneCm":1022,"stat.leaveGame":1,"stat.useItem.3":29,"achievement.exploreAllBiomes":{"value":0,"progress":["Swampland"]}} \ No newline at end of file +{"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 diff --git a/src/main/java/blocks/Block_GDCUnit.java b/src/main/java/blocks/Block_GDCUnit.java new file mode 100644 index 0000000000..d11681b1d6 --- /dev/null +++ b/src/main/java/blocks/Block_GDCUnit.java @@ -0,0 +1,29 @@ +package blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; + +public class Block_GDCUnit extends Block { + + private static Block_GDCUnit instance = new Block_GDCUnit(); + + private Block_GDCUnit() { + // I am a singleton + super(Material.iron); + } + + public static Block_GDCUnit getInstance() { + return instance; + } + + public void registerBlock() { + final String blockName = "kekztech_gdcceramicelectrolyteunit_block"; + super.setBlockName(blockName); + super.setCreativeTab(CreativeTabs.tabMisc); + super.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit"); + GameRegistry.registerBlock(getInstance(), blockName); + } +} diff --git a/src/main/java/blocks/Block_YSZUnit.java b/src/main/java/blocks/Block_YSZUnit.java new file mode 100644 index 0000000000..1e4df40c67 --- /dev/null +++ b/src/main/java/blocks/Block_YSZUnit.java @@ -0,0 +1,29 @@ +package blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; + +public class Block_YSZUnit extends Block { + + private static Block_YSZUnit instance = new Block_YSZUnit(); + + private Block_YSZUnit() { + // I am a singleton + super(Material.iron); + } + + public static Block_YSZUnit getInstance() { + return instance; + } + + public void registerBlock() { + final String blockName = "kekztech_yszceramicelectrolyteunit_block"; + super.setBlockName(blockName); + super.setCreativeTab(CreativeTabs.tabMisc); + super.setBlockTextureName(KekzCore.MODID + ":" + "YSZCeramicElectrolyteUnit"); + GameRegistry.registerBlock(getInstance(), blockName); + } +} diff --git a/src/main/java/container/Container_ModularNuclearReactor.java b/src/main/java/container/Container_ModularNuclearReactor.java new file mode 100644 index 0000000000..41b686c901 --- /dev/null +++ b/src/main/java/container/Container_ModularNuclearReactor.java @@ -0,0 +1,70 @@ +package container; + +import gregtech.api.gui.GT_Container_MultiMachine; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import reactor.ButtonSlot; +import tileentities.GTMTE_ModularNuclearReactor; + +public class Container_ModularNuclearReactor extends GT_Container_MultiMachine { + + private final GTMTE_ModularNuclearReactor REACTOR_TILE; + private final IInventory PLAYER_INVENTORY; + + private int nextSlotID = 0; + private final Slot[] REACTOR_SLOTS = new Slot[54]; + private final Slot SLOT_CONFIGURATION; + private final Slot BUTTON_EU_MODE; + private final Slot BUTTON_FLUID_MODE; + private final Slot BUTTON_CONDITION; + private final Slot BUTTON_CONFIGURE; + private final Slot BUTTON_RESET; + + + public Container_ModularNuclearReactor(InventoryPlayer inventoryPlayer, IGregTechTileEntity reactorTile) { + + super(inventoryPlayer, reactorTile); + + this.REACTOR_TILE = (GTMTE_ModularNuclearReactor) reactorTile; + this.PLAYER_INVENTORY = inventoryPlayer; + + // Add the reactor chamber + for(int x = 0; x < 9; x++) { + for(int y = 0; y < 6; y++){ + REACTOR_SLOTS[nextSlotID] = super.addSlotToContainer(new Slot(PLAYER_INVENTORY, getNextSlotID(), (16 + 67 * x), (16 + 67 * y))); + } + } + // Add the configuration slot + SLOT_CONFIGURATION = super.addSlotToContainer(new Slot(PLAYER_INVENTORY, getNextSlotID(), 0, 0)); + + // Add buttons (they're also slots) + BUTTON_EU_MODE = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0)); + BUTTON_FLUID_MODE = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0)); + BUTTON_CONDITION = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0)); + BUTTON_CONFIGURE = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0)); + BUTTON_RESET = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0)); + + } + + private int getNextSlotID() { + nextSlotID++; + return nextSlotID - 1; + } + + @Override + public boolean canInteractWith(EntityPlayer p_75145_1_) { + return true; + } + + @Override + public void detectAndSendChanges() { + super.detectAndSendChanges(); + if (REACTOR_TILE.getBaseMetaTileEntity().isServerSide() == false) { + return; + } + } + +} diff --git a/src/main/java/container/GUIContainer_ModularNuclearReactor.java b/src/main/java/container/GUIContainer_ModularNuclearReactor.java new file mode 100644 index 0000000000..58a9ff6caf --- /dev/null +++ b/src/main/java/container/GUIContainer_ModularNuclearReactor.java @@ -0,0 +1,53 @@ +package container; + +import org.lwjgl.opengl.GL11; + +import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import kekztech.KekzCore; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +public class GUIContainer_ModularNuclearReactor extends GT_GUIContainerMetaTile_Machine { + + private final String resourceName; + private final ResourceLocation texture; + + public GUIContainer_ModularNuclearReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, + String aName, String aTextureFile) { + + super(new Container_ModularNuclearReactor(aInventoryPlayer, aTileEntity), aTextureFile); + + this.resourceName = aTextureFile; + this.texture = new ResourceLocation(KekzCore.MODID, "textures/gui/" + resourceName); + } + + @SuppressWarnings("unchecked") + @Override + public void initGui() { + super.initGui(); + + // The parameters of GuiButton are (id, x, y, width, height, text) + super.buttonList.add(new GuiButton(1, 100, 200, 100, 20, "Hello")); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { + + Minecraft.getMinecraft().renderEngine.bindTexture(texture); + GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + + final int x = (super.width - super.xSize); + final int y = (super.height - super.ySize); + + super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize); + } + + @Override + protected void drawGuiContainerForegroundLayer(int par1, int par2) { + + } + +} diff --git a/src/main/java/fuelcell/Block_GDCUnit.java b/src/main/java/fuelcell/Block_GDCUnit.java deleted file mode 100644 index 6107e017a1..0000000000 --- a/src/main/java/fuelcell/Block_GDCUnit.java +++ /dev/null @@ -1,29 +0,0 @@ -package fuelcell; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class Block_GDCUnit extends Block { - - private static Block_GDCUnit instance = new Block_GDCUnit(); - - private Block_GDCUnit() { - // I am a singleton - super(Material.iron); - } - - public static Block_GDCUnit getInstance() { - return instance; - } - - public void registerBlock() { - final String blockName = "kekztech_gdcceramicelectrolyteunit_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit"); - GameRegistry.registerBlock(getInstance(), blockName); - } -} diff --git a/src/main/java/fuelcell/Block_YSZUnit.java b/src/main/java/fuelcell/Block_YSZUnit.java deleted file mode 100644 index c93f6f374a..0000000000 --- a/src/main/java/fuelcell/Block_YSZUnit.java +++ /dev/null @@ -1,29 +0,0 @@ -package fuelcell; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class Block_YSZUnit extends Block { - - private static Block_YSZUnit instance = new Block_YSZUnit(); - - private Block_YSZUnit() { - // I am a singleton - super(Material.iron); - } - - public static Block_YSZUnit getInstance() { - return instance; - } - - public void registerBlock() { - final String blockName = "kekztech_yszceramicelectrolyteunit_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "YSZCeramicElectrolyteUnit"); - GameRegistry.registerBlock(getInstance(), blockName); - } -} diff --git a/src/main/java/fuelcell/GTMTE_SOFuelCellMK1.java b/src/main/java/fuelcell/GTMTE_SOFuelCellMK1.java deleted file mode 100644 index c99f4e7dbc..0000000000 --- a/src/main/java/fuelcell/GTMTE_SOFuelCellMK1.java +++ /dev/null @@ -1,233 +0,0 @@ -package fuelcell; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.Textures; -import gregtech.api.gui.GT_GUIContainer_MultiMachine; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.api.objects.GT_RenderedTexture; -import net.minecraft.block.Block; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import reactor.GUIContainer_ModularNuclearReactor; - -public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { - - final Block CASING = GregTech_API.sBlockCasings4; - final int CASING_META = 1; - final int CASING_TEXTURE_ID = 49; - - public GTMTE_SOFuelCellMK1(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - - } - - public GTMTE_SOFuelCellMK1(String aName) { - super(aName); - - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity var1) { - return new GTMTE_SOFuelCellMK1(super.mName); - } - - @Override - public String[] getDescription() { - return new String[] { - "Oxidizes gas fuels to generate electricity without polluting the environment", - "29,480EU worth of fuel are consumed each second", - "Outputs 1024EU/t and 18,000L/s Steam", - "Additionally requires 360L/s Oxygen gas", - "------------------------------------------", - "Dimensions: 3x3x5 (WxHxL)", - "Structure:", - " 3x YSZ Ceramic Electrolyte Unit (center 1x1x3)", - " 12x Clean Stainless Steel Machine Casing (at least)", - " Controller front center", - " Dynamo Hatch back center", - " Maintenance Hatch, Input Hatches, Output Hatches" - }; - } - - //TODO - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - return aSide == aFacing - ? new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID], - new GT_RenderedTexture(aActive ? - Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE - : Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER)} - : new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID]}; - } - - //TODO - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), - "LargeTurbine.png"); - } - - @Override - public boolean isCorrectMachinePart(ItemStack stack) { - return true; - } - - @Override - public boolean checkRecipe(ItemStack stack) { - return false; - } - - //TODO - @Override - public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { - - final int XDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX; - final int ZDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ; - - int minCasingAmount = 12; - boolean checklist = true; // if this is still true at the end, machine is good to go :) - - // Front slice - for(int X = -1; X <= 1; X++) { - for(int Y = -1; Y <= 1; Y++) { - if(X == 0 && Y == 0) { - continue; // is controller - } - // Get next TE - final int THIS_X = XDIR_BACKFACE + X; - final int THIS_Z = ZDIR_BACKFACE + -1; - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z - - // Tries to add TE as either of those kinds of hatches. - // The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++) - if ( !super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addInputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID)) { - - // If it's not a hatch, is it the right casing for this machine? Check block and block meta. - if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - System.out.println("Front slice status: " +checklist +" / casings left of 12: " +minCasingAmount); - - // Middle three slices - for(int X = -1; X <= 1; X++) { - for(int Y = -1; Y <= 1; Y++) { - for(int Z = 0; Z < 3; Z++) { - final int THIS_X = XDIR_BACKFACE + X; - final int THIS_Z = ZDIR_BACKFACE + Z; - if(X == 0 && Y == 0) { - if(!thisController.getBlockOffset(THIS_X, 0, THIS_Z).getUnlocalizedName() - .equals("kekztech_yszceramicelectrolyteunit_block")) { - checklist = false; - System.out.println("Expected YSZ Ceramic"); - } - continue; - } - if(Y == 0 && (X == -1 || X == 1)) { - if(!thisController.getBlockOffset(XDIR_BACKFACE, 0, ZDIR_BACKFACE * Z).getUnlocalizedName() - .equals("blockAlloyGlass")) { - checklist = false; - System.out.println("Expected Reinforced Glass"); - } - continue; - } - // Get next TE - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z - - // Tries to add TE as either of those kinds of hatches. - // The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++) - if ( !super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addInputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID)) { - - // If it's not a hatch, is it the right casing for this machine? Check block and block meta. - if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - } - System.out.println("Middle slices status: " +checklist); - - // Back slice - for(int X = -1; X <= 1; X++) { - for(int Y = -1; Y <= 1; Y++) { - // Get next TE - final int THIS_X = XDIR_BACKFACE + X; - final int THIS_Z = ZDIR_BACKFACE + 3; - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z - - // Tries to add TE as either of those kinds of hatches. - // The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++) - if ( !super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addInputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addDynamoToMachineList(currentTE, CASING_TEXTURE_ID)) { - - // If it's not a hatch, is it the right casing for this machine? Check block and block meta. - if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - System.out.println("Back slice status: " +checklist); - - if(minCasingAmount > 0) { - checklist = false; - } - - if(this.mDynamoHatches.size() < 1) { - System.out.println("At least one dynamo hatch is required!"); - checklist = false; - } - if(this.mInputHatches.size() < 2) { - System.out.println("At least two input hatches are required!"); - checklist = false; - } - - return checklist; - } - - @Override - public int getMaxEfficiency(ItemStack stack) { - return 10000; - } - - @Override - public int getPollutionPerTick(ItemStack stack) { - return 0; - } - - @Override - public int getDamageToComponent(ItemStack stack) { - return 0; - } - - @Override - public boolean explodesOnComponentBreak(ItemStack stack) { - return false; - } - -} diff --git a/src/main/java/fuelcell/GTMTE_SOFuelCellMK2.java b/src/main/java/fuelcell/GTMTE_SOFuelCellMK2.java deleted file mode 100644 index 030e926867..0000000000 --- a/src/main/java/fuelcell/GTMTE_SOFuelCellMK2.java +++ /dev/null @@ -1,226 +0,0 @@ -package fuelcell; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.Textures; -import gregtech.api.gui.GT_GUIContainer_MultiMachine; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.api.objects.GT_RenderedTexture; -import net.minecraft.block.Block; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import reactor.GUIContainer_ModularNuclearReactor; - -public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { - - final Block CASING = GregTech_API.sBlockCasings4; - final int CASING_META = 0; - final int CASING_TEXTURE_ID = 48; - - public GTMTE_SOFuelCellMK2(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - - } - - public GTMTE_SOFuelCellMK2(String aName) { - super(aName); - - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity var1) { - return new GTMTE_SOFuelCellMK2(super.mName); - } - - @Override - public String[] getDescription() { - return new String[] { - "Oxidizes gas fuels to generate electricity without polluting the environment", - "375,680EU worth of fuel are consumed each second", - "Outputs 16,384EU/t and 96,000L/s Steam", - "Additionally requires 1920L/s Oxygen gas", - "------------------------------------------", - "Dimensions: 3x3x5 (WxHxL)", - "Structure:", - " 3x GDC Ceramic Electrolyte Unit (center 1x1x3)", - " 12x Robust Tungstensteel Machine Casing (at least)", - " Controller front center", - " Dynamo Hatch back center", - " Maintenance Hatch, Input Hatches, Output Hatches" - }; - } - - //TODO - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - return aSide == aFacing - ? new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID], - new GT_RenderedTexture(aActive ? - Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE - : Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER)} - : new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID]}; - } - - //TODO - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), - "LargeTurbine.png"); - } - - @Override - public boolean isCorrectMachinePart(ItemStack stack) { - return true; - } - - @Override - public boolean checkRecipe(ItemStack stack) { - return false; - } - - //TODO - @Override - public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { - - final int XDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX; - final int ZDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ; - - int minCasingAmount = 12; - boolean checklist = true; // if this is still true at the end, machine is good to go :) - - // Front slice - for(int X = -1; X <= 1; X++) { - for(int Y = -1; Y <= 1; Y++) { - if(X == 0 && Y == 0) { - continue; // is controller - } - // Get next TE - final int THIS_X = XDIR_BACKFACE + X; - final int THIS_Z = ZDIR_BACKFACE + 0; - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z - - // Tries to add TE as either of those kinds of hatches. - // The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++) - if ( !super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addInputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID)) { - - // If it's not a hatch, is it the right casing for this machine? Check block and block meta. - if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - - // Middle three slices - for(int X = -1; X <= 1; X++) { - for(int Y = -1; Y <= 1; Y++) { - for(int Z = 1; Z <= 3; Z++) { - if(X == 0 && Y == 0) { - if(!thisController.getBlockOffset(XDIR_BACKFACE, 0, ZDIR_BACKFACE * Z).getUnlocalizedName() - .equals("kekztech_yszceramicelectrolyteunit_block")) { - checklist = false; - } - } - if(Y == 0 && (X == -1 || X == 1)) { - if(!thisController.getBlockOffset(XDIR_BACKFACE, 0, ZDIR_BACKFACE * Z).getUnlocalizedName() - .equals("blockAlloyGlass")) { - checklist = false; - } - } - // Get next TE - final int THIS_X = XDIR_BACKFACE + X; - final int THIS_Z = ZDIR_BACKFACE + Z; - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z - - // Tries to add TE as either of those kinds of hatches. - // The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++) - if ( !super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addInputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID)) { - - // If it's not a hatch, is it the right casing for this machine? Check block and block meta. - if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - } - - // Back slice - for(int X = -1; X <= 1; X++) { - for(int Y = -1; Y <= 1; Y++) { - // Get next TE - final int THIS_X = XDIR_BACKFACE + X; - final int THIS_Z = ZDIR_BACKFACE + 0; - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(THIS_X, Y, THIS_Z);// x, y ,z - - // Tries to add TE as either of those kinds of hatches. - // The number is the texture index number for the texture that needs to be painted over the hatch texture (TAE for GT++) - if ( !super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addInputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addDynamoToMachineList(currentTE, CASING_TEXTURE_ID)) { - - // If it's not a hatch, is it the right casing for this machine? Check block and block meta. - if ((thisController.getBlockOffset(THIS_X, Y, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, Y, THIS_Z) == CASING_META)) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - - if(minCasingAmount > 0) { - checklist = false; - } - - if(this.mDynamoHatches.size() < 1) { - System.out.println("At least one dynamo hatch is required!"); - checklist = false; - } - if(this.mInputHatches.size() < 2) { - System.out.println("At least two input hatches are required!"); - checklist = false; - } - - return checklist; - } - - @Override - public int getMaxEfficiency(ItemStack stack) { - return 10000; - } - - @Override - public int getPollutionPerTick(ItemStack stack) { - return 0; - } - - @Override - public int getDamageToComponent(ItemStack stack) { - return 0; - } - - @Override - public boolean explodesOnComponentBreak(ItemStack stack) { - return false; - } - -} diff --git a/src/main/java/items/ErrorItem.java b/src/main/java/items/ErrorItem.java new file mode 100644 index 0000000000..5694b4e800 --- /dev/null +++ b/src/main/java/items/ErrorItem.java @@ -0,0 +1,42 @@ +package items; + +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ErrorItem extends Item { + + private static final ErrorItem instance = new ErrorItem(); + + private ErrorItem() { + // I am a singleton + } + + public static ErrorItem getInstance() { + return instance; + } + + public void registerItem() { + super.setHasSubtypes(false); + final String unlocalizedName = "kekztech_error_item"; + super.setUnlocalizedName(unlocalizedName); + super.setCreativeTab(CreativeTabs.tabMisc); + super.setMaxStackSize(64); + super.setTextureName(KekzCore.MODID + ":" + "Error"); + GameRegistry.registerItem(getInstance(), unlocalizedName); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { + list.add("Placeholder item in case something went wrong"); + list.add("You may report this to:"); + list.add("https://github.com/kekzdealer/KekzTech"); + } + +} diff --git a/src/main/java/items/MetaItem_CraftingComponent.java b/src/main/java/ite