aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/common/Blocks.java12
-rw-r--r--src/main/java/common/Recipes.java10
-rw-r--r--src/main/java/common/TileEntities.java12
-rw-r--r--src/main/java/common/items/MetaItem_CraftingComponent.java8
-rw-r--r--src/main/java/common/items/MetaItem_ReactorComponent.java2
-rw-r--r--src/main/java/kekztech/Items.java2
6 files changed, 24 insertions, 22 deletions
diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index 304af71460..8c145bd634 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -46,7 +46,7 @@ public class Blocks {
registerBlocks_SOFC();
registerBlocks_TFFT();
- registerBlocks_Nuclear();
+ //registerBlocks_Nuclear();
//registerBlocks_ItemProxy();
registerBlocks_Jars();
registerBlocks_LSC();
@@ -71,7 +71,7 @@ public class Blocks {
tfftMultiHatch = Block_TFFTMultiHatch.registerBlock();
}
- private static void registerBlocks_Nuclear() {
+ /*private static void registerBlocks_Nuclear() {
reactorChamberOFF = Block_ReactorChamber_OFF.registerBlock();
reactorChamberON = Block_ReactorChamber_ON.registerBlock();
reactorControlRod = Block_ControlRod.registerBlock();
@@ -81,7 +81,7 @@ public class Blocks {
itemProxyCable = Block_ItemProxyCable.registerBlock();
itemProxySource = Block_ItemProxySource.registerBlock();
itemProxyEndpoint = Block_ItemProxyEndpoint.registerBlock();
- }
+ }*/
private static void registerBlocks_Jars() {
jarThaumiumReinforced = Block_ThaumiumReinforcedJar.registerBlock();
@@ -90,14 +90,14 @@ public class Blocks {
private static void registerBlocks_LSC() {
lscLapotronicEnergyUnit = Block_LapotronicEnergyUnit.registerBlock();
- beamTransmitter = Block_BeamTransmitter.registerBlock();
+ //beamTransmitter = Block_BeamTransmitter.registerBlock();
}
- private static void registerBlocks_SpaceElevator() {
+ /*private static void registerBlocks_SpaceElevator() {
spaceElevatorStructure = Block_SpaceElevator.registerBlock();
spaceElevatorCapacitor = Block_SpaceElevatorCapacitor.registerBlock();
spaceElevatorTether = Block_SpaceElevatorTether.registerBlock();
- }
+ }*/
private static void registerBlocks_Cosmetics() {
largeHexPlate = Block_LargeHexPlate.registerBlock();
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 9c100bb8e5..87b495cf1a 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -34,7 +34,7 @@ public class Recipes {
registerRecipes_TFFT();
registerRecipes_SOFC();
- registerRecipes_Nuclear();
+ //registerRecipes_Nuclear();
registerRecipes_Jars();
registerRecipes_LSC();
//registerRecipes_SpaceElevator();
@@ -255,7 +255,7 @@ public class Recipes {
400, 1920);
}
- private static void registerRecipes_Nuclear() {
+ /*private static void registerRecipes_Nuclear() {
final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance();
@@ -331,7 +331,7 @@ public class Recipes {
craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondCrystal.getMetaID(), 4),
craftingItem.getStackFromDamage(Items.DiamondHeatPipe.getMetaID()),
null, 1200, 7680);
- }
+ }*/
private static void registerRecipes_Jars() {
@@ -569,7 +569,7 @@ public class Recipes {
);
}
- private static void registerRecipes_SpaceElevator() {
+ /*private static void registerRecipes_SpaceElevator() {
// Controller
final Object[] se_recipe = {
"BCB", "CPC", "BCB",
@@ -593,7 +593,7 @@ public class Recipes {
'C', OrePrefixes.cableGt01.get(Materials.Aluminium)
};
GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.spaceElevatorStructure, 1, 1), seCoilHolder_recipe);
- }
+ }*/
private static void registerRecipes_Cosmetics() {
diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java
index 9bb839feda..740b985b00 100644
--- a/src/main/java/common/TileEntities.java
+++ b/src/main/java/common/TileEntities.java
@@ -8,7 +8,7 @@ public class TileEntities {
// Multiblock controllers
public static GTMTE_SOFuelCellMK1 sofc1;
public static GTMTE_SOFuelCellMK2 sofc2;
- public static GTMTE_ModularNuclearReactor mdr;
+ //public static GTMTE_ModularNuclearReactor mdr;
public static GTMTE_FluidMultiStorage fms;
public static GTMTE_LapotronicSuperCapacitor lsc;
public static GTMTE_SpaceElevator se;
@@ -19,20 +19,20 @@ public class TileEntities {
public static void preInit() {
GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_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");
+ //GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");
+ //GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");
+ //GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");
GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");
GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");
//GameRegistry.registerTileEntity(TE_SpaceElevatorCapacitor.class, "kekztech_secapacitor");
- GameRegistry.registerTileEntity(TE_BeamTransmitter.class, "kekztech_beamtransmitter");
+ //GameRegistry.registerTileEntity(TE_BeamTransmitter.class, "kekztech_beamtransmitter");
}
public static void init() {
// Multiblock controllers
sofc1 = new GTMTE_SOFuelCellMK1(13101, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I");
sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II");
- mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor");
+ //mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor");
fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T");
lsc = new GTMTE_LapotronicSuperCapacitor(13106, "multimachine.supercapacitor", "Lapotronic Supercapacitor");
//se = new GTMTE_SpaceElevator(13107, "multimachine.spaceelevator", "Space Elevator");
diff --git a/src/main/java/common/items/MetaItem_CraftingComponent.java b/src/main/java/common/items/MetaItem_CraftingComponent.java
index 2b1c989831..ca1c3dee7b 100644
--- a/src/main/java/common/items/MetaItem_CraftingComponent.java
+++ b/src/main/java/common/items/MetaItem_CraftingComponent.java
@@ -33,9 +33,9 @@ public class MetaItem_CraftingComponent extends Item {
@Override
public void registerIcons(IIconRegister reg) {
- int counter = 0;
+ int counter = 9;
// Raw heat pipes
- icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "CopperHeatPipe");
+ /*icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "CopperHeatPipe");
icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "SilverHeatPipe");
icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideHeatPipe");
icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "DiamondHeatPipe");
@@ -45,7 +45,7 @@ public class MetaItem_CraftingComponent extends Item {
icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "AmineCarbamateDust");
// Crystal
icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideCrystal");
- icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondCrystal");
+ icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondCrystal");*/
// Ceramics
icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YSZCeramicDust");
icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "GDCCeramicDust");
@@ -64,7 +64,7 @@ public class MetaItem_CraftingComponent extends Item {
@SuppressWarnings({"unchecked"})
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
- for(int i = 0; i < icons.length; i++) {
+ for(int i = 9; i < icons.length; i++) {
list.add(new ItemStack(item, 1, i));
}
}
diff --git a/src/main/java/common/items/MetaItem_ReactorComponent.java b/src/main/java/common/items/MetaItem_ReactorComponent.java
index 705c6e8693..9d364e7585 100644
--- a/src/main/java/common/items/MetaItem_ReactorComponent.java
+++ b/src/main/java/common/items/MetaItem_ReactorComponent.java
@@ -37,7 +37,7 @@ public class MetaItem_ReactorComponent extends Item {
super.setUnlocalizedName(unlocalizedName);
super.setCreativeTab(CreativeTabs.tabMisc);
super.setMaxStackSize(1);
- GameRegistry.registerItem(getInstance(), unlocalizedName);
+ //GameRegistry.registerItem(getInstance(), unlocalizedName);
}
@Override
diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java
index 59873f88a0..50e56ced00 100644
--- a/src/main/java/kekztech/Items.java
+++ b/src/main/java/kekztech/Items.java
@@ -9,6 +9,7 @@ import util.Util;
import java.util.Arrays;
public enum Items {
+ /*
// Heat Vents
T1HeatVent(0,0), T2HeatVent(1,0), T3HeatVent(2,0), T4HeatVent(3,0),
T1ComponentHeatVent(4,0), T2ComponentHeatVent(5,0), T3ComponentHeatVent(6,0), T4ComponentHeatVent(7,0),
@@ -36,6 +37,7 @@ public enum Items {
CopperHeatPipe(0,1), SilverHeatPipe(1,1), BoronArsenideHeatPipe(2,1), DiamondHeatPipe(3,1),
BoronArsenideDust(4,1), IsotopicallyPureDiamondDust(5,1), AmineCarbamiteDust(6,1),
BoronArsenideCrystal(7,1), IsotopicallyPureDiamondCrystal(8,1),
+ */
// Ceramics
YSZCeramicDust(9,1), GDCCeramicDust(10,1),
YttriaDust(11,1), ZirconiaDust(12,1), CeriaDust(13,1),