diff options
| author | Christina Berchtold <kekzdealer@gmail.com> | 2019-06-08 21:44:41 +0200 |
|---|---|---|
| committer | Christina Berchtold <kekzdealer@gmail.com> | 2019-06-08 21:44:41 +0200 |
| commit | 133b330fecda75943ab3b1e379a08e3b9ba37fc3 (patch) | |
| tree | 2e331703ba1733e0851bb2e3dc0111fa0ce655d5 | |
| parent | 528d3633ab5b7534325281759ffeec4772f68da9 (diff) | |
| download | GT5-Unofficial-133b330fecda75943ab3b1e379a08e3b9ba37fc3.tar.gz GT5-Unofficial-133b330fecda75943ab3b1e379a08e3b9ba37fc3.tar.bz2 GT5-Unofficial-133b330fecda75943ab3b1e379a08e3b9ba37fc3.zip | |
structure checks and registry
39 files changed, 412 insertions, 103 deletions
diff --git a/GregTech.lang b/GregTech.lang index b4610b4923..d05f5bc08c 100644 --- a/GregTech.lang +++ b/GregTech.lang @@ -2337,6 +2337,48 @@ languagefile { S:TileEntity_DESCRIPTION_49_Index_0=Energy Injector for Multiblocks S:TileEntity_DESCRIPTION_49_Index_1=Accepts up to 2 Amps S:TileEntity_DESCRIPTION_4_Index_0=For improved Steam Machines + S:TileEntity_DESCRIPTION_5000_Index_0=Solid-oxide Fuel Cell MkI + S:TileEntity_DESCRIPTION_5000_Index_1=------------------------------------------ + S:TileEntity_DESCRIPTION_5000_Index_10= 12x Clean Stainless Steel Machine Casing (at least) + S:TileEntity_DESCRIPTION_5000_Index_11= Controller front center + S:TileEntity_DESCRIPTION_5000_Index_12= Dynamo Hatch back center + S:TileEntity_DESCRIPTION_5000_Index_13= Maintenance Hatch, Input Hatches, Output Hatches + S:TileEntity_DESCRIPTION_5000_Index_2=Oxidizes gas fuels to generate electricity without polluting the environment + S:TileEntity_DESCRIPTION_5000_Index_3=29,480EU worth of fuel are consumed each second + S:TileEntity_DESCRIPTION_5000_Index_4=Outputs 1024EU/t and 18,000L/t Steam + S:TileEntity_DESCRIPTION_5000_Index_5=Additionally requires 360L/s Oxygen gas + S:TileEntity_DESCRIPTION_5000_Index_6=------------------------------------------ + S:TileEntity_DESCRIPTION_5000_Index_7=Dimensions: 3x3x5 (WxHxL) + S:TileEntity_DESCRIPTION_5000_Index_8=Structure: + S:TileEntity_DESCRIPTION_5000_Index_9= 3x Solid YSZ Ceramic Electrolyte Unit (center 1x1x3) + S:TileEntity_DESCRIPTION_5001_Index_0=Solid-oxide Fuel Cell Mk2 + S:TileEntity_DESCRIPTION_5001_Index_1=------------------------------------------ + S:TileEntity_DESCRIPTION_5001_Index_10= 12x Robust Tungstensteel Machine Casing (at least) + S:TileEntity_DESCRIPTION_5001_Index_11= Controller front center + S:TileEntity_DESCRIPTION_5001_Index_12= Dynamo Hatch back center + S:TileEntity_DESCRIPTION_5001_Index_13= Maintenance Hatch, Input Hatches, Output Hatches + S:TileEntity_DESCRIPTION_5001_Index_2=Oxidizes gas fuels to generate electricity without polluting the environment + S:TileEntity_DESCRIPTION_5001_Index_3=375,680EU worth of fuel are consumed each second + S:TileEntity_DESCRIPTION_5001_Index_4=Outputs 16,384EU/t and 96,000L/s Steam + S:TileEntity_DESCRIPTION_5001_Index_5=Additionally requires 1920L/s Oxygen gas + S:TileEntity_DESCRIPTION_5001_Index_6=------------------------------------------ + S:TileEntity_DESCRIPTION_5001_Index_7=Dimensions: 3x3x5 (WxHxL) + S:TileEntity_DESCRIPTION_5001_Index_8=Structure: + S:TileEntity_DESCRIPTION_5001_Index_9= 3x Solid GDC Ceramic Electrolyte Unit (center 1x1x3) + S:TileEntity_DESCRIPTION_5002_Index_0=Modular Nuclear Reactor + S:TileEntity_DESCRIPTION_5002_Index_1=------------------------------------------ + S:TileEntity_DESCRIPTION_5002_Index_10= Controller front center + S:TileEntity_DESCRIPTION_5002_Index_11= Dynamo Hatch (ONLY in EU-mode, at least one) + S:TileEntity_DESCRIPTION_5002_Index_12= Input Bus, Output Bus (optional) + S:TileEntity_DESCRIPTION_5002_Index_13= Input Hatch, Output Hatch (ONLY in Coolant-Mode, at least one each) + S:TileEntity_DESCRIPTION_5002_Index_2=EU-MODE - Turn nuclear fuel into directly into electricity. + S:TileEntity_DESCRIPTION_5002_Index_3=Structure: + S:TileEntity_DESCRIPTION_5002_Index_4=COOLANT-MODE - Heat up coolant for other applications + S:TileEntity_DESCRIPTION_5002_Index_5=HU to Hot Coolant ratio is 1HU = 1L Hot Coolant + S:TileEntity_DESCRIPTION_5002_Index_6=------------------------------------------ + S:TileEntity_DESCRIPTION_5002_Index_7=Dimensions: 5x5x5 (WxHxL) + S:TileEntity_DESCRIPTION_5002_Index_8=Structure: + S:TileEntity_DESCRIPTION_5002_Index_9= 80x Radiation Proof Machine Casing (at least) S:TileEntity_DESCRIPTION_501_Index_0=Fermenting Fluids S:TileEntity_DESCRIPTION_502_Index_0=Fermenting Fluids S:TileEntity_DESCRIPTION_503_Index_0=Fermenting Fluids @@ -4902,6 +4944,8 @@ languagefile { S:gt.blockmachines.multimachine.cracker.name=Oil Cracking Unit S:gt.blockmachines.multimachine.dieselengine.name=Diesel Engine S:gt.blockmachines.multimachine.distillationtower.name=Distillation Tower + S:gt.blockmachines.multimachine.fuelcellmk1.name=SOFC MK1 + S:gt.blockmachines.multimachine.fuelcellmk2.name=Solid-Oxide Fuel Cell MK2 S:gt.blockmachines.multimachine.heatexchanger.name=Large Heat Exchanger S:gt.blockmachines.multimachine.implosioncompressor.name=Implosion Compressor S:gt.blockmachines.multimachine.largegasturbine.name=Large Gas Turbine @@ -4909,6 +4953,7 @@ languagefile { S:gt.blockmachines.multimachine.largeplasmaturbine.name=Large Plasma Generator S:gt.blockmachines.multimachine.largeturbine.name=Large Steam Turbine S:gt.blockmachines.multimachine.multifurnace.name=Multi Smelter + S:gt.blockmachines.multimachine.nuclearreactor.name=Nuclear Reactor S:gt.blockmachines.multimachine.oildrill1.name=Oil Drilling Rig S:gt.blockmachines.multimachine.oildrill2.name=Oil Drilling Rig II S:gt.blockmachines.multimachine.oildrill3.name=Oil Drilling Rig III diff --git a/config/IC2.ini b/config/IC2.ini index 55a7ad0db2..6af543ae7f 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config
-; created Jun 7, 2019 10:59:29 PM
+; created Jun 8, 2019 9:40:58 PM
;---
[worldgen]
diff --git a/config/splash.properties b/config/splash.properties index 84ee9c0b38..6b7594e1ce 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Fri Jun 07 22:59:18 CEST 2019 +#Sat Jun 08 21:40:49 CEST 2019 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/crash-reports/crash-2019-06-08_19.15.51-client.txt b/crash-reports/crash-2019-06-08_19.15.51-client.txt new file mode 100644 index 0000000000..2f1a094172 --- /dev/null +++ b/crash-reports/crash-2019-06-08_19.15.51-client.txt @@ -0,0 +1,85 @@ +---- Minecraft Crash Report ---- +// You're mean. + +Time: 6/8/19 7:15 PM +Description: There was a severe problem during mod loading that has caused the game to fail + +cpw.mods.fml.common.LoaderException: java.lang.IllegalArgumentException: The name kekztech:kekztech_gdcceramicelectrolyteunit_block has been registered twice, for fuelcell.Block_YSZUnit@4797fa5f and fuelcell.Block_GDCUnit@790b8ea1. + at cpw.mods.fml.common.registry.GameRegistry.registerBlock(GameRegistry.java:239) + at cpw.mods.fml.common.registry.GameRegistry.registerBlock(GameRegistry.java:188) + at cpw.mods.fml.common.registry.GameRegistry.registerBlock(GameRegistry.java:177) + at fuelcell.Block_GDCUnit.registerBlock(Block_GDCUnit.java:27) + at kekztech.KekzCore.preInit(KekzCore.java:40) + 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.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.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.preinitializeMods(Loader.java:556) + at cpw.mods.fml.client.FMLClientHandler.beginMinecraftLoading(FMLClientHandler.java:243) + at net.minecraft.client.Minecraft.startGame(Minecraft.java:522) + 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) +Caused by: java.lang.IllegalArgumentException: The name kekztech:kekztech_gdcceramicelectrolyteunit_block has been registered twice, for fuelcell.Block_YSZUnit@4797fa5f and fuelcell.Block_GDCUnit@790b8ea1. + at cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry.add(FMLControlledNamespacedRegistry.java:410) + at cpw.mods.fml.common.registry.GameData.registerBlock(GameData.java:894) + at cpw.mods.fml.common.registry.GameData.registerBlock(GameData.java:869) + at cpw.mods.fml.common.registry.GameRegistry.registerBlock(GameRegistry.java:229) + ... 43 more + + +A detailed walkthrough of the error, its code path and all known details is as follows: +--------------------------------------------------------------------------------------- + +-- 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: 428341832 bytes (408 MB) / 1240989696 bytes (1183 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 + UCH mcp{9.05} [Minecraft Coder Pack] (minecraft.jar) + UCH FML{7.10.99.99} [Forge Mod Loader] (forgeSrc-1.7.10-10.13.4.1614-1.7.10.jar) + UCH Forge{10.13.4.1614} [Minecraft Forge] (forgeSrc-1.7.10-10.13.4.1614-1.7.10.jar) + UCH NotEnoughItems{1.0.5.120} [Not Enough Items] (NotEnoughItems-1.7.10-1.0.5.120-dev.jar) + UCH CodeChickenCore{1.0.7.47} [CodeChicken Core] (minecraft.jar) + UCH IC2{2.2.828-experimental} [IndustrialCraft 2] (industrialcraft-2-2.2.828a-experimental-deobf.jar) + UCH gregtech{MC1710} [GregTech] (gregtech-5.09.32-dev.jar) + UCE kekztech{0.1a} [KekzTech] (bin) + UCH examplemod{1.0} [Example Mod] (bin) + UCH 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'
\ No newline at end of file diff --git a/lib/MACHINE_CASING_VENT.png b/lib/MACHINE_CASING_VENT.png Binary files differnew file mode 100644 index 0000000000..6d9fb32d7e --- /dev/null +++ b/lib/MACHINE_CASING_VENT.png diff --git a/logs/2019-06-07-3.log.gz b/logs/2019-06-07-3.log.gz Binary files differnew file mode 100644 index 0000000000..167fdf8a6c --- /dev/null +++ b/logs/2019-06-07-3.log.gz diff --git a/logs/2019-06-08-1.log.gz b/logs/2019-06-08-1.log.gz Binary files differnew file mode 100644 index 0000000000..0c7f2f3cad --- /dev/null +++ b/logs/2019-06-08-1.log.gz diff --git a/logs/2019-06-08-2.log.gz b/logs/2019-06-08-2.log.gz Binary files differnew file mode 100644 index 0000000000..c768eb63ff --- /dev/null +++ b/logs/2019-06-08-2.log.gz diff --git a/logs/2019-06-08-3.log.gz b/logs/2019-06-08-3.log.gz Binary files differnew file mode 100644 index 0000000000..dac783178f --- /dev/null +++ b/logs/2019-06-08-3.log.gz diff --git a/logs/2019-06-08-4.log.gz b/logs/2019-06-08-4.log.gz Binary files differnew file mode 100644 index 0000000000..1b3dc7304d --- /dev/null +++ b/logs/2019-06-08-4.log.gz diff --git a/logs/2019-06-08-5.log.gz b/logs/2019-06-08-5.log.gz Binary files differnew file mode 100644 index 0000000000..46c003444c --- /dev/null +++ b/logs/2019-06-08-5.log.gz diff --git a/logs/2019-06-08-6.log.gz b/logs/2019-06-08-6.log.gz Binary files differnew file mode 100644 index 0000000000..60ea60d661 --- /dev/null +++ b/logs/2019-06-08-6.log.gz diff --git a/logs/2019-06-08-7.log.gz b/logs/2019-06-08-7.log.gz Binary files differnew file mode 100644 index 0000000000..4af0292995 --- /dev/null +++ b/logs/2019-06-08-7.log.gz diff --git a/options.txt b/options.txt index 57f33d5d9f..15bd4c3fa1 100644 --- a/options.txt +++ b/options.txt @@ -1,6 +1,6 @@ invertYMouse:false mouseSensitivity:0.5 -fov:0.0 +fov:0.125 gamma:1.0 saturation:0.0 renderDistance:6 diff --git a/saves/NEI/local/New World/NEI.dat b/saves/NEI/local/New World/NEI.dat Binary files differindex eba086a5fb..78398249ba 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 f1e32705f9..5d76e45ff5 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 f1e32705f9..5d76e45ff5 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 f1e32705f9..5d76e45ff5 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 2295042965..ba932fedde 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 b6ca80faab..a57d9f0822 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 8d6f6b7602..626bfb821a 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 642b4fa63e..63d250f81e 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 630d716d16..1d982b8af4 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 ef149f1e4c..618a7fd07a 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 fb74b0c77b..4e6e96c4e1 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":2854,"stat.walkOneCm":8047,"stat.jump":7,"stat.playOneMinute":165004,"achievement.openInventory":49,"stat.climbOneCm":230,"stat.useItem.3":1,"achievement.exploreAllBiomes":{"value":0,"progress":["Swampland"]}}
\ No newline at end of file +{"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 diff --git a/src/main/java/fuelcell/Block_GDCUnit.java b/src/main/java/fuelcell/Block_GDCUnit.java new file mode 100644 index 0000000000..6107e017a1 --- /dev/null +++ b/src/main/java/fuelcell/Block_GDCUnit.java @@ -0,0 +1,29 @@ +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 new file mode 100644 index 0000000000..c93f6f374a --- /dev/null +++ b/src/main/java/fuelcell/Block_YSZUnit.java @@ -0,0 +1,29 @@ +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 index 91acd82893..c99f4e7dbc 100644 --- a/src/main/java/fuelcell/GTMTE_SOFuelCellMK1.java +++ b/src/main/java/fuelcell/GTMTE_SOFuelCellMK1.java @@ -2,6 +2,7 @@ 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; @@ -37,20 +38,18 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { @Override public String[] getDescription() { return new String[] { - "Solid-oxide Fuel Cell MkI", - "------------------------------------------", "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/t Steam", + "Outputs 1024EU/t and 18,000L/s Steam", "Additionally requires 360L/s Oxygen gas", "------------------------------------------", "Dimensions: 3x3x5 (WxHxL)", "Structure:", - " 3x Solid 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" + " 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" }; } @@ -68,8 +67,8 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { //TODO public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GUIContainer_ModularNuclearReactor(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), - "MultiblockDisplay.png"); + return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), + "LargeTurbine.png"); } @Override @@ -86,52 +85,114 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { @Override public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { - final byte SIDE_LENGTH_W = 3; - final byte SIDE_LENGTH_L = 5; - final byte MAX_OFFSET = (byte) Math.floor(SIDE_LENGTH_W / 2); - final int XDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX * MAX_OFFSET; - final int ZDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ * MAX_OFFSET; + 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 :) - for (int leftToRight = -MAX_OFFSET; leftToRight <= MAX_OFFSET; leftToRight++) { - - for (int frontToBack = -MAX_OFFSET; frontToBack <= MAX_OFFSET; frontToBack++) { + // 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 - for (int thisY = -MAX_OFFSET; thisY <= MAX_OFFSET; thisY++) { + // 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)) { - // Center 3x3x3 air cube - if((leftToRight > -2 && leftToRight < 2) && (frontToBack > -2 && frontToBack < 2) && (thisY > -2 && thisY < 2)) { - if(!thisController.getAirOffset(XDIR_BACKFACE + leftToRight, thisY, ZDIR_BACKFACE + frontToBack)) { + // 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"); } - } else if (!(XDIR_BACKFACE + leftToRight == 0 && ZDIR_BACKFACE + frontToBack == 0 && thisY == 0)) { // Make sure this isn't the controller - // Get next TE - final int THIS_X = XDIR_BACKFACE + leftToRight; - final int THIS_Z = ZDIR_BACKFACE + frontToBack; - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(THIS_X, thisY, THIS_Z);// x, y ,z + 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)) { - // 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, thisY, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, thisY, THIS_Z) == CASING_META)) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - checklist = false; - } + // 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; diff --git a/src/main/java/fuelcell/GTMTE_SOFuelCellMK2.java b/src/main/java/fuelcell/GTMTE_SOFuelCellMK2.java index dbe16c3795..030e926867 100644 --- a/src/main/java/fuelcell/GTMTE_SOFuelCellMK2.java +++ b/src/main/java/fuelcell/GTMTE_SOFuelCellMK2.java @@ -2,6 +2,7 @@ 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; @@ -37,20 +38,18 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { @Override public String[] getDescription() { return new String[] { - "Solid-oxide Fuel Cell Mk2", - "------------------------------------------", "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/t Steam", + "Outputs 16,384EU/t and 96,000L/s Steam", "Additionally requires 1920L/s Oxygen gas", "------------------------------------------", "Dimensions: 3x3x5 (WxHxL)", "Structure:", - " 3x Solid 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" + " 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" }; } @@ -68,8 +67,8 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { //TODO public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GUIContainer_ModularNuclearReactor(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), - "MultiblockDisplay.png"); + return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), + "LargeTurbine.png"); } @Override @@ -86,53 +85,108 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { @Override public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { - final byte SIDE_LENGTH_W = 3; - final byte SIDE_LENGTH_L = 5; - final byte MAX_OFFSET = (byte) Math.floor(SIDE_LENGTH_W / 2); - final int XDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX * MAX_OFFSET; - final int ZDIR_BACKFACE = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ * MAX_OFFSET; + 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 :) - for (int leftToRight = -MAX_OFFSET; leftToRight <= MAX_OFFSET; leftToRight++) { - - for (int frontToBack = -MAX_OFFSET; frontToBack <= MAX_OFFSET; frontToBack++) { + // 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 - for (int thisY = -MAX_OFFSET; thisY <= MAX_OFFSET; thisY++) { + // 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)) { - // Center 3x3x3 air cube - if((leftToRight > -2 && leftToRight < 2) && (frontToBack > -2 && frontToBack < 2) && (thisY > -2 && thisY < 2)) { - if(!thisController.getAirOffset(XDIR_BACKFACE + leftToRight, thisY, ZDIR_BACKFACE + frontToBack)) { + // 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; } - } else if (!(XDIR_BACKFACE + leftToRight == 0 && ZDIR_BACKFACE + frontToBack == 0 && thisY == 0)) { // Make sure this isn't the controller - // Get next TE - final int THIS_X = XDIR_BACKFACE + leftToRight; - final int THIS_Z = ZDIR_BACKFACE + frontToBack; - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(THIS_X, thisY, THIS_Z);// x, y ,z + } + // 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)) { - // 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, thisY, THIS_Z) == CASING) && (thisController.getMetaIDOffset(THIS_X, thisY, THIS_Z) == CASING_META)) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - checklist = false; - } + // 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; } diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 8d191a5901..bfcd382577 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -4,16 +4,17 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import fuelcell.Block_GDCUnit; +import fuelcell.Block_YSZUnit; +import fuelcell.GTMTE_SOFuelCellMK1; +import fuelcell.GTMTE_SOFuelCellMK2; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; -import reactor.items.CoolantCell; -import reactor.items.FuelRod; +import reactor.GTMTE_ModularNuclearReactor; import reactor.items.HeatExchanger; import reactor.items.HeatPipe; -import reactor.items.HeatVent; -import reactor.items.NeutronReflector; @Mod(modid = KekzCore.MODID, name = KekzCore.NAME, version = KekzCore.VERSION, dependencies = "required-after:IC2; " @@ -30,13 +31,20 @@ public class KekzCore { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { + // Items ErrorItem.getInstance().registerItem(); MetaItem_ReactorComponent.getInstance().registerItem(); MetaItem_CraftingComponent.getInstance().registerItem(); + // Blocks + Block_YSZUnit.getInstance().registerBlock(); + Block_GDCUnit.getInstance().registerBlock(); } @Mod.EventHandler public void init(FMLInitializationEvent event ) { + final GTMTE_SOFuelCellMK1 sofc1 = new GTMTE_SOFuelCellMK1(5000, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I"); + final GTMTE_SOFuelCellMK2 sofc2 = new GTMTE_SOFuelCellMK2(5001, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II"); + final GTMTE_ModularNuclearReactor mdr = new GTMTE_ModularNuclearReactor(5002, "multimachine.nuclearreactor", "Nuclear Reactor"); } diff --git a/src/main/java/reactor/GTMTE_ModularNuclearReactor.java b/src/main/java/reactor/GTMTE_ModularNuclearReactor.java index f3d9a2a00c..f7572d589b 100644 --- a/src/main/java/reactor/GTMTE_ModularNuclearReactor.java +++ b/src/main/java/reactor/GTMTE_ModularNuclearReactor.java @@ -38,20 +38,15 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas @Override public String[] getDescription() { return new String[] { - "Modular Nuclear Reactor", - "------------------------------------------", - "EU-MODE - Turn nuclear fuel into directly into electricity.", - "", - "COOLANT-MODE - Heat up coolant for other applications", - "HU to Hot Coolant ratio is 1HU = 1L Hot Coolant", + "does things", "------------------------------------------", "Dimensions: 5x5x5 (WxHxL)", "Structure:", - " 80x Radiation Proof Machine Casing (at least)", - " Controller front center", - " Dynamo Hatch (ONLY in EU-mode, at least one)", - " Input Bus, Output Bus (optional)", - " Input Hatch, Output Hatch (ONLY in Coolant-Mode, at least one each)" + " 80x Radiation Proof Machine Casing (at least)", + " Controller front center", + " Dynamo Hatch (ONLY in EU-mode, at least one)", + " Input Bus, Output Bus (optional)", + " Input Hatch, Output Hatch (ONLY in Coolant-Mode, at least one each)" }; } diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang index ae0422c100..3a7e5002d8 100644 --- a/src/main/resources/assets/kekztech/lang/en_US.lang +++ b/src/main/resources/assets/kekztech/lang/en_US.lang @@ -72,3 +72,6 @@ item.kekztech_crafting_item.12.name=Zirconia Dust item.kekztech_crafting_item.13.name=Ceria Dust item.kekztech_crafting_item.14.name=YSZ Ceramic Plate item.kekztech_crafting_item.15.name=GDC Ceramic Plate + +tile.kekztech_gdcceramicelectrolyteunit_block.name=GDC Ceramic Electrolyte Unit +tile.kekztech_yszceramicelectrolyteunit_block.name=YSZ Ceramic Electrolyte Unit diff --git a/src/main/resources/assets/kekztech/textures/blocks/GDCCeramicElectrolyteUnit.png b/src/main/resources/assets/kekztech/textures/blocks/GDCCeramicElectrolyteUnit.png Binary files differnew file mode 100644 index 0000000000..fe83dcba26 --- /dev/null +++ b/src/main/resources/assets/kekztech/textures/blocks/GDCCeramicElectrolyteUnit.png diff --git a/src/main/resources/assets/kekztech/textures/blocks/YSZCeramicElectrolyteUnit.png b/src/main/resources/assets/kekztech/textures/blocks/YSZCeramicElectrolyteUnit.png Binary files differnew file mode 100644 index 0000000000..e0533fcfb4 --- /dev/null +++ b/src/main/resources/assets/kekztech/textures/blocks/YSZCeramicElectrolyteUnit.png diff --git a/src/main/resources/assets/kekztech/textures/items/GDCCeramicDust.png b/src/main/resources/assets/kekztech/textures/items/GDCCeramicDust.png Binary files differindex afe773a3dc..15761a2ead 100644 --- a/src/main/resources/assets/kekztech/textures/items/GDCCeramicDust.png +++ b/src/main/resources/assets/kekztech/textures/items/GDCCeramicDust.png diff --git a/src/main/resources/assets/kekztech/textures/items/GDCCeramicPlate.png b/src/main/resources/assets/kekztech/textures/items/GDCCeramicPlate.png Binary files differindex 7ee66c231d..3d564d516f 100644 --- a/src/main/resources/assets/kekztech/textures/items/GDCCeramicPlate.png +++ b/src/main/resources/assets/kekztech/textures/items/GDCCeramicPlate.png diff --git a/src/main/resources/assets/kekztech/textures/items/YSZCeramicDust.png b/src/main/resources/assets/kekztech/textures/items/YSZCeramicDust.png Binary files differindex 0bf06d8d56..da612bddd7 100644 --- a/src/main/resources/assets/kekztech/textures/items/YSZCeramicDust.png +++ b/src/main/resources/assets/kekztech/textures/items/YSZCeramicDust.png diff --git a/src/main/resources/assets/kekztech/textures/items/YSZCeramicPlate.png b/src/main/resources/assets/kekztech/textures/items/YSZCeramicPlate.png Binary files differindex 6cfacec026..2e6e7e7e79 100644 --- a/src/main/resources/assets/kekztech/textures/items/YSZCeramicPlate.png +++ b/src/main/resources/assets/kekztech/textures/items/YSZCeramicPlate.png diff --git a/src/main/resources/assets/kekztech/textures/items/plate.png b/src/main/resources/assets/kekztech/textures/items/plate.png Binary files differdeleted file mode 100644 index d31178c3c6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/plate.png +++ /dev/null |
