aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/CodeChickenLib.cfg2
-rw-r--r--config/IC2.ini336
-rw-r--r--config/splash.properties2
-rw-r--r--mods/CodeChickenCore-1.7.10-1.0.7.47-universal.jarbin145782 -> 0 bytes
-rw-r--r--src/main/java/kekztech/ItemDistributionNetworkController.java14
-rw-r--r--src/main/java/reactor/items/CoolantCell.java11
-rw-r--r--src/main/java/reactor/items/FuelRod.java36
-rw-r--r--src/main/java/reactor/items/HeatExchanger.java37
-rw-r--r--src/main/java/reactor/items/HeatVent.java6
-rw-r--r--src/main/java/reactor/items/NeutronReflector.java11
-rw-r--r--src/main/java/tileentities/TE_ItemDistributionNode.java7
11 files changed, 180 insertions, 282 deletions
diff --git a/config/CodeChickenLib.cfg b/config/CodeChickenLib.cfg
index 94d4c170a5..947513c59e 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=C:\Users\Kekzdealer\.gradle\caches\minecraft\net\minecraftforge\forge\1.7.10-10.13.4.1614-1.7.10\unpacked\conf
+mappingDir=/home/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 f1f5ebb5e1..9ee503d3b6 100644
--- a/config/IC2.ini
+++ b/config/IC2.ini
@@ -1,168 +1,168 @@
-; ic2 general config
-; created Nov 9, 2019 6:10:47 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 Nov 9, 2019 6:42:47 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 708e73fd10..90ebbfc549 100644
--- a/config/splash.properties
+++ b/config/splash.properties
@@ -1,5 +1,5 @@
#Splash screen properties
-#Sat Nov 09 18:10:34 CET 2019
+#Sat Nov 09 18:42:39 CET 2019
logoTexture=textures/gui/title/mojang.png
background=0xFFFFFF
font=0x0
diff --git a/mods/CodeChickenCore-1.7.10-1.0.7.47-universal.jar b/mods/CodeChickenCore-1.7.10-1.0.7.47-universal.jar
deleted file mode 100644
index 93c29f42c8..0000000000
--- a/mods/CodeChickenCore-1.7.10-1.0.7.47-universal.jar
+++ /dev/null
Binary files differ
diff --git a/src/main/java/kekztech/ItemDistributionNetworkController.java b/src/main/java/kekztech/ItemDistributionNetworkController.java
index bf976898e5..11383845b2 100644
--- a/src/main/java/kekztech/ItemDistributionNetworkController.java
+++ b/src/main/java/kekztech/ItemDistributionNetworkController.java
@@ -1,7 +1,6 @@
package kekztech;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.UUID;
@@ -34,7 +33,7 @@ public class ItemDistributionNetworkController implements Comparable<ItemDistrib
conduit.setNetwork(new ItemDistributionNetworkController());
conduit.getNetwork().addConduit(conduit);
-
+ /*
final TileEntity te = (TileEntity) conduit;
final int x = te.xCoord;
final int y = te.yCoord;
@@ -87,7 +86,7 @@ public class ItemDistributionNetworkController implements Comparable<ItemDistrib
final ItemDistributionNetworkController r = networkList.getLast();
l.appendNetwork(r);
networkList.removeLast();
- }
+ }*/
}
@@ -176,6 +175,7 @@ public class ItemDistributionNetworkController implements Comparable<ItemDistrib
*/
private void addConduit(IConduit conduit) {
conduits.add(conduit);
+ conduit.setNetwork(this);
}
/**
@@ -185,11 +185,9 @@ public class ItemDistributionNetworkController implements Comparable<ItemDistrib
* Network to merge with this one.
*/
private void appendNetwork(ItemDistributionNetworkController network) {
-
+ for(IConduit conduit : network.conduits) {
+ this.addConduit(conduit);
+ }
}
- private void updateSource() {
-
- }
-
}
diff --git a/src/main/java/reactor/items/CoolantCell.java b/src/main/java/reactor/items/CoolantCell.java
index b166b3fc3d..abfc9ad88f 100644
--- a/src/main/java/reactor/items/CoolantCell.java
+++ b/src/main/java/reactor/items/CoolantCell.java
@@ -1,9 +1,5 @@
package reactor.items;
-import items.MetaItem_ReactorComponent;
-import kekztech.GTRecipe;
-import kekztech.Items;
-
public class CoolantCell {
public static String TYPE = "CoolantCell";
@@ -16,11 +12,4 @@ public class CoolantCell {
360000, 360000
};
- public static GTRecipe[] RECIPE = {
- new GTRecipe().setDuration(1200).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.HeliumCoolantCell360k.getMetaID())),
- new GTRecipe().setDuration(1200).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.NaKCoolantCell360k.getMetaID()))
- };
-
}
diff --git a/src/main/java/reactor/items/FuelRod.java b/src/main/java/reactor/items/FuelRod.java
index 9cb697a373..9642412f9d 100644
--- a/src/main/java/reactor/items/FuelRod.java
+++ b/src/main/java/reactor/items/FuelRod.java
@@ -1,9 +1,5 @@
package reactor.items;
-import items.MetaItem_ReactorComponent;
-import kekztech.GTRecipe;
-import kekztech.Items;
-
public class FuelRod {
public static final int METAOFFSET = 17;
@@ -79,36 +75,4 @@ public class FuelRod {
10, 10, 10
};
- public static final GTRecipe[] RECIPE = {
- // Uranium Fuel Rod
- new GTRecipe().setDuration(600).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.UraniumFuelRod.getMetaID())),
- new GTRecipe().setDuration(800).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.UraniumDualFuelRod.getMetaID())),
- new GTRecipe().setDuration(1000).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.UraniumQuadFuelRod.getMetaID())),
- // Thorium Fuel Rod
- new GTRecipe().setDuration(600).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.ThoriumFuelRod.getMetaID())),
- new GTRecipe().setDuration(800).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.ThoriumDualFuelRod.getMetaID())),
- new GTRecipe().setDuration(1000).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.ThoriumQuadFuelRod.getMetaID())),
- // MOX Fuel Rod
- new GTRecipe().setDuration(600).setEUPerTick(1920)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.MOXFuelRod.getMetaID())),
- new GTRecipe().setDuration(800).setEUPerTick(1920)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.MOXDualFuelRod.getMetaID())),
- new GTRecipe().setDuration(1000).setEUPerTick(1920)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.MOXQuadFuelRod.getMetaID())),
- // Naquadah Fuel Rod
- new GTRecipe().setDuration(600).setEUPerTick(7680)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.NaquadahFuelRod.getMetaID())),
- new GTRecipe().setDuration(800).setEUPerTick(7680)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.NaquadahDualFuelRod.getMetaID())),
- new GTRecipe().setDuration(1000).setEUPerTick(7680)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.NaquadahQuadFuelRod.getMetaID())),
- // Thorium MOX Fuel Rod
- };
-
}
diff --git a/src/main/java/reactor/items/HeatExchanger.java b/src/main/java/reactor/items/HeatExchanger.java
index 7018f620ec..d85ed325ca 100644
--- a/src/main/java/reactor/items/HeatExchanger.java
+++ b/src/main/java/reactor/items/HeatExchanger.java
@@ -1,12 +1,5 @@
package reactor.items;
-import items.MetaItem_CraftingComponent;
-import items.MetaItem_ReactorComponent;
-import kekztech.GTRecipe;
-import kekztech.Items;
-import net.minecraftforge.fluids.FluidRegistry;
-import util.Util;
-
public class HeatExchanger {
public static String TYPE = "HeatExchanger";
@@ -27,34 +20,4 @@ public class HeatExchanger {
4, 8, 32, 128
};
- public static GTRecipe[] RECIPE = {
- new GTRecipe().setDuration(200).setEUPerTick(120)
- .addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.CopperHeatPipe.getMetaID(), 4))
- .addInputItem(Util.getStackofAmountFromOreDict("plateDenseCopper", 1))
- .addInputFluid(FluidRegistry.getFluidStack("molten.copper", 576))
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T1HeatExchanger.getMetaID())),
- new GTRecipe().setDuration(400).setEUPerTick(480)
- .addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.SilverHeatPipe.getMetaID(), 4))
- .addInputItem(Util.getStackofAmountFromOreDict("plateDenseSilver", 1))
- .addInputFluid(FluidRegistry.getFluidStack("molten.silver", 576))
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T2HeatExchanger.getMetaID())),
- new GTRecipe().setDuration(800).setEUPerTick(7680)
- .addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.BoronArsenideHeatPipe.getMetaID(), 4))
- .addInputItem(Util.getStackofAmountFromOreDict("pipeTinyCopper", 4))
- .addInputItem(Util.getStackofAmountFromOreDict("wireFineSilver", 16))
- //.addInputItem(new ItemStack(ItemList.Pump_EV.getItem(), 1))
- .addInputFluid(FluidRegistry.getFluidStack("ic2coolant", 720))
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T3HeatExchanger.getMetaID())),
- new GTRecipe().setDuration(1600).setEUPerTick(30720)
- .addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.DiamondHeatPipe.getMetaID(), 4))
- .addInputItem(Util.getStackofAmountFromOreDict("frameGTHSSE", 1))
- .addInputItem(Util.getStackofAmountFromOreDict("plateHSSE", 6))
- .addInputItem(Util.getStackofAmountFromOreDict("screwOsmiridium", 24))
- .addInputItem(Util.getStackofAmountFromOreDict("pipeTinyEnderium", 4))
- //.addInputItem(new ItemStack(ItemList.Pump_LuV.getItem(), 1))
- .addInputFluid(FluidRegistry.getFluidStack("molten.gallium", 1152))
- .addInputFluid(FluidRegistry.getFluidStack("helium", 10000))
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T4HeatExchanger.getMetaID()))
- };
-
}
diff --git a/src/main/java/reactor/items/HeatVent.java b/src/main/java/reactor/items/HeatVent.java
index b6c48120b4..1ae0388de3 100644
--- a/src/main/java/reactor/items/HeatVent.java
+++ b/src/main/java/reactor/items/HeatVent.java
@@ -1,7 +1,5 @@
package reactor.items;
-import kekztech.GTRecipe;
-
public class HeatVent {
public static final String TYPE = "HeatVent";
@@ -43,8 +41,4 @@ public class HeatVent {
10, 20, 80, 160
};
- public static final GTRecipe[] RECIPE = {
-
- };
-
}
diff --git a/src/main/java/reactor/items/NeutronReflector.java b/src/main/java/reactor/items/NeutronReflector.java
index 9275b860ae..773f34ee49 100644
--- a/src/main/java/reactor/items/NeutronReflector.java
+++ b/src/main/java/reactor/items/NeutronReflector.java
@@ -1,9 +1,5 @@
package reactor.items;
-import items.MetaItem_ReactorComponent;
-import kekztech.GTRecipe;
-import kekztech.Items;
-
public class NeutronReflector {
public static String TYPE = "NeutronReflector";
@@ -16,11 +12,4 @@ public class NeutronReflector {
512000, 2147483647
};
- public static GTRecipe[] RECIPE = {
- new GTRecipe().setDuration(1200).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T1NeutronReflector.getMetaID())),
- new GTRecipe().setDuration(4800).setEUPerTick(7680)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T2NeutronReflector.getMetaID()))
- };
-
}
diff --git a/src/main/java/tileentities/TE_ItemDistributionNode.java b/src/main/java/tileentities/TE_ItemDistributionNode.java
index 25d7b64680..20b6500598 100644
--- a/src/main/java/tileentities/TE_ItemDistributionNode.java
+++ b/src/main/java/tileentities/TE_ItemDistributionNode.java
@@ -5,16 +5,14 @@ import kekztech.ItemDistributionNetworkController;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.Constants;
public class TE_ItemDistributionNode extends TileEntity implements IConduit, IInventory {
private ItemDistributionNetworkController network;
public TE_ItemDistributionNode() {
+ ItemDistributionNetworkController.placeConduit(this);
}
@Override
@@ -71,6 +69,9 @@ private ItemDistributionNetworkController network;
@Override
public void setInventorySlotContents(int slot, ItemStack itemStack) {
+ if(itemStack == null) {
+ return;
+ }
if(itemStack.stackSize > getInventoryStackLimit()) {
itemStack.stackSize = getInventoryStackLimit();
}
generated by cgit (git 2.46.0) at 2025-03-09 20:22:45 +0000