aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristina Berchtold <kekzdealer@gmail.com>2020-05-04 00:21:42 +0200
committerChristina Berchtold <kekzdealer@gmail.com>2020-05-04 00:21:42 +0200
commitd0ff8c1c6b6dbe4b6f3ce33a380ee837632a9507 (patch)
tree08ce83b210625caadef4d48c913276756a20ac19
parent90efd08c2b3cee3fe0ad0b4e70e8762ff7a31a53 (diff)
downloadGT5-Unofficial-d0ff8c1c6b6dbe4b6f3ce33a380ee837632a9507.tar.gz
GT5-Unofficial-d0ff8c1c6b6dbe4b6f3ce33a380ee837632a9507.tar.bz2
GT5-Unofficial-d0ff8c1c6b6dbe4b6f3ce33a380ee837632a9507.zip
visiting Lucy
-rw-r--r--config/CodeChickenLib.cfg2
-rw-r--r--config/IC2.ini336
-rw-r--r--config/splash.properties2
-rw-r--r--src/main/java/common/Blocks.java8
-rw-r--r--src/main/java/common/blocks/BaseGTUpdateableBlock.java4
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyCable.java2
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyEndpoint.java2
-rw-r--r--src/main/java/common/blocks/Block_ItemProxySource.java2
-rw-r--r--src/main/java/common/blocks/Block_ItemServerDrive.java2
-rw-r--r--src/main/java/common/blocks/Block_ItemServerIOPort.java2
-rw-r--r--src/main/java/common/blocks/Block_ItemServerRackCasing.java2
-rw-r--r--src/main/java/common/blocks/Block_LapotronicEnergyUnit.java99
-rw-r--r--src/main/java/common/blocks/Block_TFFTMultiHatch.java2
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java2
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java2
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java2
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java2
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java2
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemProxyCable.java (renamed from src/main/java/itemBlocks/IB_ItemProxyCable.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java (renamed from src/main/java/itemBlocks/IB_ItemProxyEndpoint.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemProxySource.java (renamed from src/main/java/itemBlocks/IB_ItemProxySource.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemServerDrive.java (renamed from src/main/java/itemBlocks/IB_ItemServerDrive.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemServerIOPort.java (renamed from src/main/java/itemBlocks/IB_ItemServerIOPort.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemServerRackCasing.java (renamed from src/main/java/itemBlocks/IB_ItemServerRackCasing.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java39
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java (renamed from src/main/java/itemBlocks/IB_TFFTMultiHatch.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java)2
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java)2
-rw-r--r--src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java229
-rw-r--r--src/main/resources/assets/kekztech/lang/en_US.lang13
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LSCBase_side.pngbin0 -> 251 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LSCBase_top.pngbin0 -> 266 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit.pngbin314 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_side.pngbin0 -> 279 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_top.pngbin0 -> 296 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2.pngbin311 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_side.pngbin0 -> 279 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_top.pngbin0 -> 295 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3.pngbin324 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_side.pngbin0 -> 279 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_top.pngbin0 -> 296 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4.pngbin329 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_side.pngbin0 -> 280 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_top.pngbin0 -> 296 bytes
47 files changed, 582 insertions, 198 deletions
diff --git a/config/CodeChickenLib.cfg b/config/CodeChickenLib.cfg
index 947513c59e..94d4c170a5 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\Kekzdealer\.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 fac63dbab6..f9d2745c7b 100644
--- a/config/IC2.ini
+++ b/config/IC2.ini
@@ -1,168 +1,168 @@
-; ic2 general config
-; created Apr 26, 2020 2:01:20 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 May 1, 2020 7:42:23 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
+
diff --git a/config/splash.properties b/config/splash.properties
index f0cb69ed0a..2877e2c1c9 100644
--- a/config/splash.properties
+++ b/config/splash.properties
@@ -1,5 +1,5 @@
#Splash screen properties
-#Sun Apr 26 14:01:09 CEST 2020
+#Fri May 01 19:42:05 CEST 2020
logoTexture=textures/gui/title/mojang.png
background=0xFFFFFF
font=0x0
diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index 055b4bf0a9..d7211e2b13 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -9,6 +9,7 @@ import common.blocks.Block_ItemProxySource;
import common.blocks.Block_ItemServerDrive;
import common.blocks.Block_ItemServerIOPort;
import common.blocks.Block_ItemServerRackCasing;
+import common.blocks.Block_LapotronicEnergyUnit;
import common.blocks.Block_ReactorChamber_OFF;
import common.blocks.Block_ReactorChamber_ON;
import common.blocks.Block_TFFTCasing;
@@ -50,6 +51,8 @@ public class Blocks {
public static Block jarThaumiumReinforced;
public static Block jarIchor;
+ public static Block lscLapotronicEnergyUnit;
+
public static void init() {
System.out.println("Registering blocks...");
@@ -59,6 +62,7 @@ public class Blocks {
//registerBlocks_ItemServer();
//registerBlocks_ItemProxy();
registerBlocks_Jars();
+ registerBlocks_LSC();
System.out.println("Finished registering blocks");
}
@@ -100,4 +104,8 @@ public class Blocks {
jarThaumiumReinforced = Block_ThaumiumReinforcedJar.registerBlock();
jarIchor = Block_IchorJar.registerBlock();
}
+
+ private static void registerBlocks_LSC() {
+ lscLapotronicEnergyUnit = Block_LapotronicEnergyUnit.registerBlock();
+ }
}
diff --git a/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
index 8ca9a31fc0..3d1ce633c1 100644
--- a/src/main/java/common/blocks/BaseGTUpdateableBlock.java
+++ b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
@@ -8,8 +8,8 @@ import net.minecraft.world.World;
public abstract class BaseGTUpdateableBlock extends Block {
- protected BaseGTUpdateableBlock(Material p_i45394_1_) {
- super(p_i45394_1_);
+ protected BaseGTUpdateableBlock(Material material) {
+ super(material);
GregTech_API.registerMachineBlock(this, -1);
}
diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
index d7a4a2dcb2..23f082a2bd 100644
--- a/src/main/java/common/blocks/Block_ItemProxyCable.java
+++ b/src/main/java/common/blocks/Block_ItemProxyCable.java
@@ -1,8 +1,8 @@
package common.blocks;
+import common.itemBlocks.IB_ItemProxyCable;
import common.tileentities.TE_ItemProxyCable;
import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemProxyCable;
import kekztech.KekzCore;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
index d2fdea8029..68aa206836 100644
--- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
+++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
@@ -2,9 +2,9 @@ package common.blocks;
import java.util.UUID;
+import common.itemBlocks.IB_ItemProxyEndpoint;
import common.tileentities.TE_ItemProxyEndpoint;
import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemProxyEndpoint;
import items.Item_Configurator;
import kekztech.GuiHandler;
import kekztech.KekzCore;
diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java
index 715a6e2bdf..d09368a1a2 100644
--- a/src/main/java/common/blocks/Block_ItemProxySource.java
+++ b/src/main/java/common/blocks/Block_ItemProxySource.java
@@ -1,8 +1,8 @@
package common.blocks;
+import common.itemBlocks.IB_ItemProxySource;
import common.tileentities.TE_ItemProxySource;
import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemProxySource;
import items.Item_Configurator;
import kekztech.GuiHandler;
import kekztech.KekzCore;
diff --git a/src/main/java/common/blocks/Block_ItemServerDrive.java b/src/main/java/common/blocks/Block_ItemServerDrive.java
index 38b54da41a..e6268e5402 100644
--- a/src/main/java/common/blocks/Block_ItemServerDrive.java
+++ b/src/main/java/common/blocks/Block_ItemServerDrive.java
@@ -1,7 +1,7 @@
package common.blocks;
+import common.itemBlocks.IB_ItemServerDrive;
import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemServerDrive;
import kekztech.KekzCore;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
diff --git a/src/main/java/common/blocks/Block_ItemServerIOPort.java b/src/main/java/common/blocks/Block_ItemServerIOPort.java
index 1b40ae89a3..cae471dec4 100644
--- a/src/main/java/common/blocks/Block_ItemServerIOPort.java
+++ b/src/main/java/common/blocks/Block_ItemServerIOPort.java
@@ -1,8 +1,8 @@
package common.blocks;
+import common.itemBlocks.IB_ItemServerIOPort;
import common.tileentities.TE_ItemServerIOPort;
import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemServerIOPort;
import kekztech.KekzCore;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
diff --git a/src/main/java/common/blocks/Block_ItemServerRackCasing.java b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
index fbddd34315..37cca58615 100644
--- a/src/main/java/common/blocks/Block_ItemServerRackCasing.java
+++ b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
@@ -1,7 +1,7 @@
package common.blocks;
+import common.itemBlocks.IB_ItemServerRackCasing;
import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemServerRackCasing;
import kekztech.KekzCore;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
diff --git a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
new file mode 100644
index 0000000000..bf6170ab65
--- /dev/null
+++ b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
@@ -0,0 +1,99 @@
+package common.blocks;
+
+import java.util.List;
+
+import common.itemBlocks.IB_LapotronicEnergyUnit;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
+
+ private static final Block_LapotronicEnergyUnit instance = new Block_LapotronicEnergyUnit();
+
+ private IIcon iconBaseSide;
+ private IIcon iconBaseTop;
+
+ private IIcon iconLapoIVSide;
+ private IIcon iconLapoIVTop;
+ private IIcon iconLapoLuVSide;
+ private IIcon iconLapoLuVTop;
+ private IIcon iconLapoZPMSide;
+ private IIcon iconLapoZPMTop;
+ private IIcon iconLapoUVSide;
+ private IIcon iconLapoUVTop;
+ private IIcon iconUltimateSide;
+ private IIcon iconUltimateTop;
+ private IIcon iconReallyUltimateSide;
+ private IIcon iconReallyUltimateTop;
+
+ private Block_LapotronicEnergyUnit() {
+ super(Material.iron);
+ }
+
+ public static Block registerBlock() {
+ final String blockName = "kekztech_lapotronicenergyunit_block";
+ instance.setBlockName(blockName);
+ instance.setCreativeTab(CreativeTabs.tabMisc);
+ instance.setHardness(5.0f);
+ instance.setResistance(6.0f);
+ GameRegistry.registerBlock(instance, IB_LapotronicEnergyUnit.class, blockName);
+
+ return instance;
+ }
+
+ @Override
+ public void registerBlockIcons(IIconRegister ir) {
+ iconBaseSide = ir.registerIcon("kekztech:LSCBase_side");
+ iconBaseTop = ir.registerIcon("kekztech:LSCBase_top");
+
+ iconLapoIVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit1_side");
+ iconLapoIVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit1_top");
+ iconLapoLuVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit2_side");
+ iconLapoLuVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit2_top");
+ iconLapoZPMSide = ir.registerIcon("kekztech:LapotronicEnergyUnit3_side");
+ iconLapoZPMTop = ir.registerIcon("kekztech:LapotronicEnergyUnit3_top");
+ iconLapoUVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit4_side");
+ iconLapoUVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit4_top");
+
+ iconUltimateSide = ir.registerIcon("kekztech:UltimateEnergyUnit_side");
+ iconUltimateTop = ir.registerIcon("kekztech:UltimateEnergyUnit_top");
+ iconReallyUltimateSide = ir.registerIcon("kekztech:ReallyUltimateEnergyUnit_side");
+ iconReallyUltimateTop = ir.registerIcon("kekztech:ReallyUltimateEnergyUnit_top");
+ }
+
+ @Override
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3Li