re-enabled WIP content for further dev work

5 files changed, 184 insertions, 184 deletions

diff --git a/.classpath b/.classpath
index 93ee7b3fb3..6d3a77a1a2 100644
--- a/.classpath
+++ b/.classpath
@@ -3,12 +3,12 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/home/kekzdealer/eclipse-workspace/KekzTech/libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar"/>
 	<classpathentry kind="lib" path="libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar"/>
 	<classpathentry kind="lib" path="libs/gregtech-5.09.32-dev.jar" sourcepath="libs/gregtech-5.09.32-dev-src.zip"/>
 	<classpathentry kind="lib" path="libs/industrialcraft-2-2.2.828a-experimental-deobf.jar"/>
 	<classpathentry kind="lib" path="libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Forge"/>
 	<classpathentry kind="lib" path="libs/joml-1.9.18.jar"/>
+	<classpathentry kind="lib" path="libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/config/CodeChickenLib.cfg b/config/CodeChickenLib.cfg
index 947513c59e..096dec5432 100644
--- a/config/CodeChickenLib.cfg
+++ b/config/CodeChickenLib.cfg
@@ -3,6 +3,6 @@
 dump_asm=true
 
 #Path to directory holding packaged.srg, fields.csv and methods.csv for mcp remapping
-mappingDir=/home/kekzdealer/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/unpacked/conf
+mappingDir=C:\Users\kekzd\.gradle\caches\minecraft\net\minecraftforge\forge\1.7.10-10.13.4.1614-1.7.10\unpacked\conf
 
 textify=true
diff --git a/config/IC2.ini b/config/IC2.ini
index 580b091f45..859e45e7f7 100644
--- a/config/IC2.ini
+++ b/config/IC2.ini
@@ -1,168 +1,168 @@
-; ic2 general config
-; created Mar 4, 2020 3:14:35 PM
-;---
-
-[worldgen]
-; Enable generation of rubber trees in the world.
-rubberTree = true
-; Enable generation of copper in the world.
-copperOre = true
-; Enable generation of tin in the world.
-tinOre = true
-; Enable generation of uranium in the world.
-uraniumOre = true
-; Enable generation of Lead in the world.
-leadOre = true
-; Factor scaling the IC2 ore generation quantity.
-oreDensityFactor = 1.0
-
-[protection]
-; Enable logging of players when they remove a machine using a wrench.
-wrenchLogging = true
-; Maximum Explosion power of a nuke, where TNT is 4.
-nukeExplosionPowerLimit = 60
-; Maximum explosion power of a nuclear reactor, where TNT is 4.
-reactorExplosionPowerLimit = 45
-; Enable the nuke
-enableNuke = true
-
-[balance]
-; Maximum battery tier usable by the miner.
-; 1 = batteries, 2 = lead batteries, 3 = energy crystals, 4 = lapotron crystals
-minerDischargeTier = 1
-; Increase the energy use by the player's inventory weight when going through a teleporter.
-teleporterUseInventoryWeight = true
-; Ratio of energy retained inside energy storage block Items when wrenched.
-; 0 (nothing) ... 1 (100%), default 0.8 (80 %)
-energyRetainedInStorageBlockDrops = 0.8
-; Factor to scale the UU-Matter production energy requirement.
-uuEnergyFactor = 1.0
-; Disable the vanilla ender chest, removing existing ones from the world as well.
-disableEnderChest = false
-; Comma separated list of blocks and items which should not be turned into scrap by the recycler.
-; Format: <name>[@metadata], metadata * matches any.
-; Ore dictionary entries can be specified with OreDict:<ore dict name> as the name.
-recyclerBlacklist = minecraft:glass_pane, minecraft:stick, minecraft:snowball, minecraft:snow_layer, minecraft:snow, IC2:blockScaffold
-; Whitelist for blocks/items allowed to be recycled.
-; The whitelist will be used instead of the blacklist approach if it's non-empty, disallowing everything else.
-; The format is the same as the blacklist.
-recyclerWhitelist = 
-; Allow to pick blocks up using just a pickaxe instead of needing a wrench.
-ignoreWrenchRequirement = false
-
-; Base energy generation factors - increase for higher energy yield.
-[balance / energy / generator]
-generator = 1.0
-geothermal = 1.0
-; Deprecated, because of Kinetic Watermill
-water = 1.0
-solar = 1.0
-; Deprecated, because of Kinetic Windmill
-wind = 1.0
-nuclear = 1.0
-semiFluidOil = 1.0
-semiFluidFuel = 1.0
-semiFluidBiomass = 1.0
-semiFluidBioethanol = 1.0
-semiFluidBiogas = 1.0
-Stirling = 1.0
-Kinetic = 1.0
-radioisotope = 1.0
-
-; Base heat generation factors - increase for higher heat yield.
-[balance / energy / heatgenerator]
-semiFluidOil = 1.0
-semiFluidFuel = 1.0
-semiFluidBiomass = 1.0
-semiFluidBioethanol = 1.0
-semiFluidBiogas = 1.0
-solid = 1.0
-radioisotope = 1.0
-electric = 1.0
-
-; Base kinetic generation factors - increase for higher kinetic energy yield.
-[balance / energy / kineticgenerator]
-water = 1.0
-wind = 1.0
-manual = 1.0
-steam = 1.0
-electric = 1.0
-
-; Basically the amount of hU the conversion of one mB of Liquid takes/gives
-[balance / energy / fluidconversion]
-; Lava -> PahoehoeLava
-heatExchangerLava = 1.0
-; Hot Coolant <-> Cold Coolant
-heatExchangerHotCoolant = 1.0
-; Hot Water <- Water
-heatExchangerWater = 1.0
-
-; Base Coolant conversion rate for FluidReactors.
-[balance / energy / FluidReactor]
-outputModifier = 1.0
-
-; Balace Value for Turbine Livetime in sec. Default 86400sec = 24h
-[balance / SteamKineticGenerator]
-rotorlivetime = 86400
-
-; Balace Values for calcification default 100.000mB Water -> to failure
-[balance / steamgenerator / calcification]
-maxcalcification = 100000
-
-; Balance Values for Fermenter
-[balance / fermenter]
-need_amount_biomass_per_run = 10
-output_amount_biogas_per_run = 200
-hU_per_run = 8000
-biomass_per_fertilizier = 500
-
-; Additional initial uu values, a value of 1 equals cobblestone.
-; Recipes may cause the final value be lower than the one specified here.
-; Format: <name>[@metadata] = <value>
-[balance / uu-values / predefined]
-IC2:itemOreIridium = 12000
-
-[recipes]
-; To modify recipes or add custom recipes, copy the corresponding .ini file to
-; "minecraft/config/ic2" and modify it.
-; 
-; Disable IC2 crafting recipes with the specified output, comma separated list.
-; Recipes in the additional section below aren't affected.
-; Format: <name>[@metadata], e.g. minecraft:bucket to disable IC2's bucket recipe from tin.
-disable = 
-; Purge crafting recipes with the specified output, including vanilla and mod ones, comma separated list.
-; Recipes in the additional section below aren't affected.
-; Format: <name>[@metadata], e.g. minecraft:tnt to disable crafting tnt.
-purge = 
-; Enable crafting of IC2 coins, otherwise they have to be spawned in and are thus limited.
-allowCoinCrafting = true
-; Allow only IC2 circuits to be used in IC2's recipes.
-requireIc2Circuits = false
-; Adjust smelting recipes to always output IC2 items if available.
-smeltToIc2Items = false
-; Ignore invalid recipes.
-ignoreInvalidRecipes = false
-
-[misc]
-; Enable IC2's custom sound system.
-enableIc2Audio = true
-; Maximum number of active audio sources, only change it if you know what you're doing.
-maxAudioSourceCount = 32
-; Enable hiding of secret recipes in CraftGuide/NEI.
-hideSecretRecipes = true
-; Enable activation of the quantum leggings' speed boost when sprinting instead of holding the boost key.
-quantumSpeedOnSprint = true
-; Enable burning of scrap in a generator.
-allowBurningScrap = true
-; Comma separated list with ores the miner should harvest.
-; Format: <name>[@metadata], e.g. minecraft:torch, minecraft:chest
-; The metadata * will match any, e.g. minecraft:log@*.
-; Ore dictionary entries can be specified with OreDict:<ore dict name> as the name.
-additionalValuableOres = 
-; Use the new highly experimental current + voltage energy net model with energy loss.
-; Only set this to true if you know what you are doing.
-useLinearTransferModel = false
-; Potion ID of radiation potion.
-; Do not change this after you created a world...
-radiationPotionID = 24
-
+; ic2 general config

+; created 10-Mar-2020 20:15:10

+;---

+

+[worldgen]

+; Enable generation of rubber trees in the world.

+rubberTree = true

+; Enable generation of copper in the world.

+copperOre = true

+; Enable generation of tin in the world.

+tinOre = true

+; Enable generation of uranium in the world.

+uraniumOre = true

+; Enable generation of Lead in the world.

+leadOre = true

+; Factor scaling the IC2 ore generation quantity.

+oreDensityFactor = 1.0

+

+[protection]

+; Enable logging of players when they remove a machine using a wrench.

+wrenchLogging = true

+; Maximum Explosion power of a nuke, where TNT is 4.

+nukeExplosionPowerLimit = 60

+; Maximum explosion power of a nuclear reactor, where TNT is 4.

+reactorExplosionPowerLimit = 45

+; Enable the nuke

+enableNuke = true

+

+[balance]

+; Maximum battery tier usable by the miner.


+; 1 = batteries, 2 = lead batteries, 3 = energy crystals, 4 = lapotron crystals

+minerDischargeTier = 1

+; Increase the energy use by the player's inventory weight when going through a teleporter.

+teleporterUseInventoryWeight = true

+; Ratio of energy retained inside energy storage block Items when wrenched.


+; 0 (nothing) ... 1 (100%), default 0.8 (80 %)

+energyRetainedInStorageBlockDrops = 0.8

+; Factor to scale the UU-Matter production energy requirement.

+uuEnergyFactor = 1.0

+; Disable the vanilla ender chest, removing existing ones from the world as well.

+disableEnderChest = false

+; Comma separated list of blocks and items which should not be turned into scrap by the recycler.


+; Format: <name>[@metadata], metadata * matches any.


+; Ore dictionary entries can be specified with OreDict:<ore dict name> as the name.

+recyclerBlacklist = minecraft:glass_pane, minecraft:stick, minecraft:snowball, minecraft:snow_layer, minecraft:snow, IC2:blockScaffold

+; Whitelist for blocks/items allowed to be recycled.


+; The whitelist will be used instead of the blacklist approach if it's non-empty, disallowing everything else.


+; The format is the same as the blacklist.

+recyclerWhitelist = 

+; Allow to pick blocks up using just a pickaxe instead of needing a wrench.

+ignoreWrenchRequirement = false

+

+; Base energy generation factors - increase for higher energy yield.

+[balance / energy / generator]

+generator = 1.0

+geothermal = 1.0

+; Deprecated, because of Kinetic Watermill

+water = 1.0

+solar = 1.0

+; Deprecated, because of Kinetic Windmill

+wind = 1.0

+nuclear = 1.0

+semiFluidOil = 1.0

+semiFluidFuel = 1.0

+semiFluidBiomass = 1.0

+semiFluidBioethanol = 1.0

+semiFluidBiogas = 1.0

+Stirling = 1.0

+Kinetic = 1.0

+radioisotope = 1.0

+

+; Base heat generation factors - increase for higher heat yield.

+[balance / energy / heatgenerator]

+semiFluidOil = 1.0

+semiFluidFuel = 1.0

+semiFluidBiomass = 1.0

+semiFluidBioethanol = 1.0

+semiFluidBiogas = 1.0

+solid = 1.0

+radioisotope = 1.0

+electric = 1.0

+

+; Base kinetic generation factors - increase for higher kinetic energy yield.

+[balance / energy / kineticgenerator]

+water = 1.0

+wind = 1.0

+manual = 1.0

+steam = 1.0

+electric = 1.0

+

+; Basically the amount of hU the conversion of one mB of Liquid takes/gives

+[balance / energy / fluidconversion]

+; Lava -> PahoehoeLava

+heatExchangerLava = 1.0

+; Hot Coolant <-> Cold Coolant

+heatExchangerHotCoolant = 1.0

+; Hot Water <- Water

+heatExchangerWater = 1.0

+

+; Base Coolant conversion rate for FluidReactors.

+[balance / energy / FluidReactor]

+outputModifier = 1.0

+

+; Balace Value for Turbine Livetime in sec. Default 86400sec = 24h

+[balance / SteamKineticGenerator]

+rotorlivetime = 86400

+

+; Balace Values for calcification default 100.000mB Water -> to failure

+[balance / steamgenerator / calcification]

+maxcalcification = 100000

+

+; Balance Values for Fermenter

+[balance / fermenter]

+need_amount_biomass_per_run = 10

+output_amount_biogas_per_run = 200

+hU_per_run = 8000

+biomass_per_fertilizier = 500

+

+; Additional initial uu values, a value of 1 equals cobblestone.


+; Recipes may cause the final value be lower than the one specified here.


+; Format: <name>[@metadata] = <value>

+[balance / uu-values / predefined]

+IC2:itemOreIridium = 12000

+

+[recipes]

+; To modify recipes or add custom recipes, copy the corresponding .ini file to


+; "minecraft/config/ic2" and modify it.


+; 


+; Disable IC2 crafting recipes with the specified output, comma separated list.


+; Recipes in the additional section below aren't affected.


+; Format: <name>[@metadata], e.g. minecraft:bucket to disable IC2's bucket recipe from tin.

+disable = 

+; Purge crafting recipes with the specified output, including vanilla and mod ones, comma separated list.


+; Recipes in the additional section below aren't affected.


+; Format: <name>[@metadata], e.g. minecraft:tnt to disable crafting tnt.

+purge = 

+; Enable crafting of IC2 coins, otherwise they have to be spawned in and are thus limited.

+allowCoinCrafting = true

+; Allow only IC2 circuits to be used in IC2's recipes.

+requireIc2Circuits = false

+; Adjust smelting recipes to always output IC2 items if available.

+smeltToIc2Items = false

+; Ignore invalid recipes.

+ignoreInvalidRecipes = false

+

+[misc]

+; Enable IC2's custom sound system.

+enableIc2Audio = true

+; Maximum number of active audio sources, only change it if you know what you're doing.

+maxAudioSourceCount = 32

+; Enable hiding of secret recipes in CraftGuide/NEI.

+hideSecretRecipes = true

+; Enable activation of the quantum leggings' speed boost when sprinting instead of holding the boost key.

+quantumSpeedOnSprint = true

+; Enable burning of scrap in a generator.

+allowBurningScrap = true

+; Comma separated list with ores the miner should harvest.


+; Format: <name>[@metadata], e.g. minecraft:torch, minecraft:chest


+; The metadata * will match any, e.g. minecraft:log@*.


+; Ore dictionary entries can be specified with OreDict:<ore dict name> as the name.

+additionalValuableOres = 

+; Use the new highly experimental current + voltage energy net model with energy loss.


+; Only set this to true if you know what you are doing.

+useLinearTransferModel = false

+; Potion ID of radiation potion.


+; Do not change this after you created a world...

+radiationPotionID = 24

+

diff --git a/config/splash.properties b/config/splash.properties
index 17de033fc3..7f5845bd66 100644
--- a/config/splash.properties
+++ b/config/splash.properties
@@ -1,5 +1,5 @@
 #Splash screen properties
-#Wed Mar 04 15:14:27 CET 2020
+#Tue Mar 10 20:14:59 CET 2020
 logoTexture=textures/gui/title/mojang.png
 background=0xFFFFFF
 font=0x0
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index c7fe8df8ee..368ea6f185 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -85,7 +85,7 @@ public class KekzCore {
 		ErrorItem.getInstance().registerItem();

 		MetaItem_ReactorComponent.getInstance().registerItem();

 		MetaItem_CraftingComponent.getInstance().registerItem();

-		// disabled for release; Item_Configurator.getInstance().registerItem();

+		Item_Configurator.getInstance().registerItem();

 		Items.registerOreDictNames();

 		// Blocks

 		Block_YSZUnit.getInstance().registerBlock();

@@ -100,18 +100,18 @@ public class KekzCore {
 		Block_ReactorChamber_OFF.getInstance().registerBlock();

 		Block_ReactorChamber_ON.getInstance().registerBlock();

 		Block_ControlRod.getInstance().registerBlock();

-		// disabled for release; Block_ItemServerDrive.getInstance().registerBlock();

-		// disabled for release; Block_ItemServerRackCasing.getInstance().registerBlock();

-		// disabled for release; Block_ItemServerIOPort.getInstance().registerBlock();

-		// disabled for release; Block_ItemProxyCable.getInstance().registerBlock();

-		// disabled for release; Block_ItemProxySource.getInstance().registerBlock();

-		// disabled for release; Block_ItemProxyEndpoint.getInstance().registerBlock();

+		Block_ItemServerDrive.getInstance().registerBlock();

+		Block_ItemServerRackCasing.getInstance().registerBlock();

+		Block_ItemServerIOPort.getInstance().registerBlock();

+		Block_ItemProxyCable.getInstance().registerBlock();

+		Block_ItemProxySource.getInstance().registerBlock();

+		Block_ItemProxyEndpoint.getInstance().registerBlock();

 		// Register TileEntities

 		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");

-		// disabled for release; GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");

-		// disabled for release; GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");

-		// disabled for release; GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");

-		// disabled for release; GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");

+		GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");

+		GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");

+		GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");

+		GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");

 		

 		// Register guis

 		NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());

@@ -124,9 +124,9 @@ public class KekzCore {
 		sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II");

 		mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor");

 		fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T");

-		// disabled for release; is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server");	

+		is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server");	

 		// Register renderer

-		// disabled for release; ConduitRenderer.getInstance().registerRenderer();

+		ConduitRenderer.getInstance().registerRenderer();

 	}

 	

 	@Mod.EventHandler