.gitignore

@@ -1,5 +1,5 @@
 # eclipse
-bin/
+bin
 *.launch
 .settings
 .metadata
@@ -14,7 +14,7 @@ out
 .idea
 
 # gradle
-build/
+build
 .gradle
 
 # forge
@@ -24,7 +24,5 @@ forge-1.12.2-14.23.5.2847-mdk.zip
 src/main/resources/assets/base/
 
 # other
-eclipse/
+eclipse
-run/*
+run
-!run/scripts/
-!run/resources/

run/resources/nuclearcraft/blockstates/fission_heater_port_extreme.json

@@ -1,17 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model": "nuclearcraft:fission_port",
-		"textures": {
-			"front": "nuclearcraft:blocks/heater_port_extreme"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"axis": {
-			"x": {"y": 90},
-			"y": {"x": 90},
-			"z": {}
-		}
-	}
-}

run/resources/nuclearcraft/blockstates/fission_heater_port_sic_sic_cmc.json

@@ -1,17 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model": "nuclearcraft:fission_port",
-		"textures": {
-			"front": "nuclearcraft:blocks/heater_port_sic_sic_cmc"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"axis": {
-			"x": {"y": 90},
-			"y": {"x": 90},
-			"z": {}
-		}
-	}
-}

run/resources/nuclearcraft/blockstates/salt_fission_heater_extreme.json

@@ -1,13 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model":"cube_all",
-		"textures": {
-			"all": "nuclearcraft:blocks/heater_extreme"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"normal": [{}]
-	}
-}

run/resources/nuclearcraft/blockstates/salt_fission_heater_sic_sic_cmc.json

@@ -1,13 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model":"cube_all",
-		"textures": {
-			"all": "nuclearcraft:blocks/heater_sic_sic_cmc"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"normal": [{}]
-	}
-}

run/resources/nuclearcraft/blockstates/solid_fission_sink_extreme.json

@@ -1,13 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model":"cube_all",
-		"textures": {
-			"all": "nuclearcraft:blocks/sink_extreme"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"normal": [{}]
-	}
-}

run/resources/nuclearcraft/blockstates/solid_fission_sink_sic_sic_cmc.json

@@ -1,13 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model":"cube_all",
-		"textures": {
-			"all": "nuclearcraft:blocks/sink_sic_sic_cmc"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"normal": [{}]
-	}
-}

run/resources/nuclearcraft/blockstates/turbine_dynamo_coil_extreme.json

@@ -1,13 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model":"cube_all",
-		"textures": {
-			"all": "nuclearcraft:blocks/coil_extreme"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"normal": [{}]
-	}
-}

run/resources/nuclearcraft/blockstates/turbine_dynamo_coil_sic_sic_cmc.json

@@ -1,13 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model":"cube_all",
-		"textures": {
-			"all": "nuclearcraft:blocks/coil_sic_sic_cmc"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"normal": [{}]
-	}
-}

run/resources/nuclearcraft/blockstates/turbine_rotor_blade_copper.json

@@ -1,20 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model": "nuclearcraft:turbine_rotor_blade",
-		"textures": {
-			"texture": "nuclearcraft:blocks/blade_copper"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"dir": {
-			"invisible": {
-				"model": "nuclearcraft:block_invisible"
-			},
-			"x": {"x": 90, "y": 90},
-			"y": {},
-			"z": {"x": 90}
-		}
-	}
-}

run/resources/nuclearcraft/blockstates/turbine_rotor_blade_manganese.json

@@ -1,20 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model": "nuclearcraft:turbine_rotor_blade",
-		"textures": {
-			"texture": "nuclearcraft:blocks/blade_manganese"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"dir": {
-			"invisible": {
-				"model": "nuclearcraft:block_invisible"
-			},
-			"x": {"x": 90, "y": 90},
-			"y": {},
-			"z": {"x": 90}
-		}
-	}
-}

run/resources/nuclearcraft/blockstates/turbine_rotor_stator_boron.json

@@ -1,20 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model": "nuclearcraft:turbine_rotor_stator",
-		"textures": {
-			"texture": "nuclearcraft:blocks/stator_boron"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"dir": {
-			"invisible": {
-				"model": "nuclearcraft:block_invisible"
-			},
-			"x": {"x": 90, "y": 90},
-			"y": {},
-			"z": {"x": 90}
-		}
-	}
-}

run/resources/nuclearcraft/blockstates/turbine_rotor_stator_magnesium.json

@@ -1,20 +0,0 @@
-{
-	"forge_marker": 1,
-	"defaults": {
-		"model": "nuclearcraft:turbine_rotor_stator",
-		"textures": {
-			"texture": "nuclearcraft:blocks/stator_magnesium"
-		}
-	},
-	"variants": {
-		"inventory": [{}],
-		"dir": {
-			"invisible": {
-				"model": "nuclearcraft:block_invisible"
-			},
-			"x": {"x": 90, "y": 90},
-			"y": {},
-			"z": {"x": 90}
-		}
-	}
-}

run/resources/nuclearcraft/lang/en_us.lang

@@ -1,32 +0,0 @@
-tile.nuclearcraft.solid_fission_sink_extreme.name=Extreme Alloy Fission Heat Sink
-tile.nuclearcraft.solid_fission_sink_sic_sic_cmc.name=SiC-SiC CMC Fission Heat Sink
-
-tile.nuclearcraft.salt_fission_heater_extreme.name=Extreme Alloy Fission Coolant Heater
-tile.nuclearcraft.salt_fission_heater_sic_sic_cmc.name=SiC-SiC CMC Fission Coolant Heater
-
-tile.nuclearcraft.fission_heater_port_extreme.name=Extreme Alloy Fission Coolant Heater Port
-tile.nuclearcraft.fission_heater_port_sic_sic_cmc.name=SiC-SiC CMC Fission Coolant Heater Port
-
-tile.nuclearcraft.turbine_dynamo_coil_extreme.name=Extreme Alloy Turbine Dynamo Coil
-tile.nuclearcraft.turbine_dynamo_coil_sic_sic_cmc.name=SiC-SiC CMC Turbine Dynamo Coil
-
-tile.nuclearcraft.turbine_rotor_blade_manganese.name=Manganese Turbine Rotor Blade
-tile.nuclearcraft.turbine_rotor_blade_copper.name=Copper Turbine Rotor Blade
-
-tile.nuclearcraft.turbine_rotor_stator_magnesium.name=Magnesium Turbine Rotor Stator
-tile.nuclearcraft.turbine_rotor_stator_boron.name=Boron Turbine Rotor Stator
-
-nc.sf.extreme_sink0=%s valid extreme alloy sink
-nc.sf.extreme_sink1=%s valid extreme alloy sinks
-nc.sf.sic_sic_cmc_sink0=%s valid SiC-SiC CMC sink
-nc.sf.sic_sic_cmc_sink1=%s valid SiC-SiC CMC sinks
-
-nc.sf.extreme_heater0=%s functional extreme alloy heater
-nc.sf.extreme_heater1=%s functional extreme alloy heaters
-nc.sf.sic_sic_cmc_heater0=%s functional SiC-SiC CMC heater
-nc.sf.sic_sic_cmc_heater1=%s functional SiC-SiC CMC heaters
-
-nc.sf.extreme_coil0=%s extreme alloy dynamo coil
-nc.sf.extreme_coil1=%s extreme alloy dynamo coils
-nc.sf.sic_sic_cmc_coil0=%s SiC-SiC CMC dynamo coil
-nc.sf.sic_sic_cmc_coil1=%s SiC-SiC CMC dynamo coils

run/resources/pack.mcmeta

@@ -1 +0,0 @@
-{"pack":{"pack_format":3,"description":"B.A.S.E External Resources"}}

run/scripts/components.zs

@@ -1,16 +0,0 @@
-#loader preinit
-
-mods.nuclearcraft.Registration.registerFissionSink("extreme", 210, "exactly one sic_sic_cmc sink");
-mods.nuclearcraft.Registration.registerFissionSink("sic_sic_cmc", 215, "exactly one lead sink");
-
-mods.nuclearcraft.Registration.registerFissionHeater("extreme", "tritium", 1, "deuterium", 1, 210, "exactly one sic_sic_cmc heater");
-mods.nuclearcraft.Registration.registerFissionHeater("sic_sic_cmc", "helium3", 1, "helium", 1, 215, "exactly one lead heater");
-
-mods.nuclearcraft.Registration.registerTurbineCoil("extreme", 1.14, "four of any coil");
-mods.nuclearcraft.Registration.registerTurbineCoil("sic_sic_cmc", 1.16, "exactly two axial connectors");
-
-mods.nuclearcraft.Registration.registerTurbineBlade("manganese", 1.05, 1.35);
-mods.nuclearcraft.Registration.registerTurbineBlade("copper", 1.15, 1.55);
-
-mods.nuclearcraft.Registration.registerTurbineStator("magnesium", 0.6);
-mods.nuclearcraft.Registration.registerTurbineStator("boron", 0.85);

run/scripts/recipes.zs

@@ -1,9 +0,0 @@
-#mods.nuclearcraft.Extractor.addRecipe(<ore:ingotGold>*8 | <minecraft:diamond>*2, mods.nuclearcraft.ChanceItemIngredient.create(<ore:ingotIron>*4, 50, 2), mods.nuclearcraft.ChanceFluidIngredient.create(<liquid:liquid_nitrogen>*250, 75, 35), 1.5, 2.0);
-
-#mods.nuclearcraft.ChemicalReactor.addRecipe(<liquid:hydrogen>*750 | <liquid:deuterium>*500 | <liquid:tritium>*250, <liquid:water>*500 | null, null, mods.nuclearcraft.ChanceFluidIngredient.create(<liquid:liquid_helium>*100, 40, 10, 60), 2.0, 1.5, 0.000000005);
-
-#mods.nuclearcraft.FuelReprocessor.addRecipe(<ore:ingotSilver>*4, <ore:ingotManganese>*4, <ore:ingotManganeseOxide>*4, <ore:ingotManganeseDioxide>*4, <ore:ingotIron>*5, <ore:ingotGold>*6, null);
-
-#mods.nuclearcraft.Manufactory.addRecipe(<minecraft:magma_cream>*5, null);
-
-#mods.nuclearcraft.SolidFission.addRecipe(<minecraft:magma_cream>*4 | <minecraft:diamond>*2, mods.nuclearcraft.ChanceItemIngredient.create(<ore:ingotSilver>*4, 50, 2), 100, 125, 1.15, 99, true, 0.005);

src/main/java/nc/render/tile/RenderTurbineRotor.java

@@ -41,7 +41,7 @@ public class RenderTurbineRotor extends TileEntitySpecialRenderer<TileTurbineCon
 		if (turbine == null) return;
 		
 		int flowLength = turbine.getFlowLength(), bladeLength = turbine.bladeLength, shaftWidth = turbine.shaftWidth;
-		if (turbine.rotorStateArray == null || turbine.bladeDepths == null || turbine.statorDepths == null || turbine.rotorStateArray.length < 1 + 4 * flowLength) {
+		if (turbine.rotorStateArray == null || turbine.rotorStateArray.length < 1 + 4 * flowLength) {
 			PacketHandler.instance.sendToServer(new TurbineResendFormPacket(controller.getPos()));
 			return;
 		}