1
0
mirror of https://github.com/turbodiesel4598/NuclearCraft synced 2025-11-09 10:14:41 +01:00

Compare commits

..

No commits in common. "6facfcfa1fdca1b9eaf77cbebc713362b4cd4531" and "777b46b08887908003bf529bcc9dcad606daeb3a" have entirely different histories.

28 changed files with 126 additions and 198 deletions

View File

@ -9,9 +9,9 @@ import net.minecraft.util.math.BlockPos;
public abstract class TileCuboidalMultiblockPart<MULTIBLOCK extends CuboidalMultiblock> extends TileMultiblockPart<MULTIBLOCK> {
protected final CuboidalPartPositionType positionType;
protected PartPosition position;
protected BlockFacing outwardFacings;
private final CuboidalPartPositionType positionType;
private PartPosition position;
private BlockFacing outwardFacings;
public TileCuboidalMultiblockPart(Class<MULTIBLOCK> tClass, CuboidalPartPositionType positionType) {
super(tClass);

View File

@ -6,7 +6,6 @@ import static nc.recipe.NCRecipes.fission_reflector;
import javax.annotation.Nonnull;
import nc.enumm.MetaEnums;
import nc.multiblock.BlockFacing;
import nc.multiblock.cuboidal.*;
import nc.multiblock.fission.FissionReactor;
import nc.multiblock.fission.block.BlockFissionSource;
@ -111,14 +110,10 @@ public abstract class TileFissionSource extends TileFissionPart {
}
public PrimingTargetInfo getPrimingTarget(boolean simulate) {
EnumFacing facing = getPartPosition().getFacing();
if (facing == null) {
facing = this.facing;
if (facing == null) {
return null;
}
if (getPartPosition().getFacing() == null) {
return null;
}
EnumFacing dir = facing.getOpposite();
EnumFacing facing = getPartPosition().getFacing(), dir = facing.getOpposite();
for (int i = 1; i <= fission_max_size; i++) {
BlockPos offPos = pos.offset(dir, i);
ProcessorRecipe blockRecipe = RecipeHelper.blockRecipe(fission_reflector, world, offPos);

View File

@ -2,7 +2,7 @@
"parent": "nuclearcraft:block/wall_part",
"textures": {
"side": "nuclearcraft:blocks/fission/port/side",
"top": "nuclearcraft:blocks/fission/port/top",
"top": "nuclearcraft:blocks/fission/port/side",
"in": "#front",
"out": "#front"
}

View File

@ -0,0 +1,7 @@
{
"name": "Condenser (WIP)",
"description": "",
"icon": "nuclearcraft:condenser_controller",
"parent": "nuclearcraft:heat_exchanger",
"sortnum": 0
}

View File

@ -1,6 +1,6 @@
{
"name": "The Basics",
"name": "Introduction",
"description": "A journey of many isotopes begins with a single tree.",
"icon": "nuclearcraft:ingot:0",
"icon": "nuclearcraft:fuel_uranium:11",
"sortnum": 0
}

View File

@ -0,0 +1,7 @@
{
"name": "Turbine",
"description": "Ashes to ashes, steam to steam.",
"icon": "nuclearcraft:heat_exchanger_controller",
"parent": "nuclearcraft:multiblocks",
"sortnum": 3
}

View File

@ -1,12 +0,0 @@
{
"name": "Introduction",
"icon": "nuclearcraft:ingot:4",
"category": "nuclearcraft:basics",
"sortnum": 0,
"pages": [
{
"type": "text",
"text": "NuclearCraft (NC) is a tech mod focused on nuclear power generation. Most of the mod's features and mechanics are inspired by real equivalents, though there are many simplifications, abstractions and deviations from the real deal in order to exchange tedium for interesting gameplay."
}
]
}

View File

@ -1,8 +1,7 @@
{
"name": "Molten Salt Reactor (WIP)",
"name": "Molten Salt Reactor",
"icon": "nuclearcraft:salt_fission_controller",
"category": "nuclearcraft:fission",
"sortnum": 2,
"pages": [
{
"type": "text",

View File

@ -1,8 +1,7 @@
{
"name": "Pebble-Bed Reactor (WIP)",
"name": "Pebble-Bed Reactor",
"icon": "nuclearcraft:pebble_fission_controller",
"category": "nuclearcraft:fission",
"sortnum": 0,
"pages": [
{
"type": "text",

View File

@ -2,11 +2,10 @@
"name": "Solid Fuel Reactor",
"icon": "nuclearcraft:solid_fission_controller",
"category": "nuclearcraft:fission",
"sortnum": 1,
"pages": [
{
"type": "text",
"text": "The solid fuel fission reactor generates heat from the self-sustained nuclear reaction of solid fission fuel, which is transferred to water or other available coolant."
"text": ""
}
]
}

View File

@ -1,8 +1,7 @@
{
"name": "Tokamak Reactor (WIP)",
"name": "Tokamak Reactor",
"icon": "nuclearcraft:tokamak_fusion_controller",
"category": "nuclearcraft:fusion",
"sortnum": 0,
"pages": [
{
"type": "text",

View File

@ -1,12 +0,0 @@
{
"name": "Condenser (WIP)",
"icon": "nuclearcraft:condenser_controller",
"category": "nuclearcraft:heat_exchanger",
"sortnum": 1,
"pages": [
{
"type": "text",
"text": ""
}
]
}

View File

@ -1,8 +1,7 @@
{
"name": "Heat Exchanger (WIP)",
"name": "Heat Exchanger",
"icon": "nuclearcraft:heat_exchanger_controller",
"category": "nuclearcraft:heat_exchanger",
"sortnum": 0,
"pages": [
{
"type": "text",

View File

@ -0,0 +1,11 @@
{
"name": "The Basics",
"icon": "nuclearcraft:ingot:4",
"category": "nuclearcraft:introduction",
"pages": [
{
"type": "text",
"text": "NuclearCraft (NC) is a tech mod focused on nuclear power generation."
}
]
}

View File

@ -1,40 +0,0 @@
{
"name": "Collectors",
"icon": "nuclearcraft:cobblestone_generator",
"category": "nuclearcraft:machines",
"sortnum": 2,
"pages": [
{
"anchor": "intro",
"type": "text",
"text": "These blocks continuously generate materials over time. They will push their items or fluids to adjacent containers if possible."
},
{
"anchor": "cobblestone_generator",
"type": "machines/3_tier_machine",
"header": "Cobblestone Generators",
"tier1": "nuclearcraft:cobblestone_generator",
"tier2": "nuclearcraft:cobblestone_generator_compact",
"tier3": "nuclearcraft:cobblestone_generator_dense",
"text": "Combines water and lava to generate cobblestone."
},
{
"anchor": "water_source",
"type": "machines/3_tier_machine",
"header": "Infinite Water Sources",
"tier1": "nuclearcraft:water_source",
"tier2": "nuclearcraft:water_source_compact",
"tier3": "nuclearcraft:water_source_dense",
"text": "Makes use of the magic of the infinite water source."
},
{
"anchor": "nitrogen_collector",
"type": "machines/3_tier_machine",
"header": "Nitrogen Collectors",
"tier1": "nuclearcraft:nitrogen_collector",
"tier2": "nuclearcraft:nitrogen_collector_compact",
"tier3": "nuclearcraft:nitrogen_collector_dense",
"text": "Seperates out and collects nitrogen from the air."
}
]
}

View File

@ -1,13 +1,12 @@
{
"name": "Batteries",
"icon": "nuclearcraft:lithium_ion_battery_basic",
"category": "nuclearcraft:multiblocks",
"sortnum": 1,
"name": "Energy Storage",
"icon": "nuclearcraft:lithium_ion_battery_elite",
"category": "nuclearcraft:machines",
"pages": [
{
"anchor": "intro",
"type": "text",
"text": "These blocks are used to store energy. They will form multiblocks if placed adjacent to each other. Right-click with a multitool to configure a side."
"text": "These blocks store energy. If two of the same type are placed next to each other, they will share their stored energy"
},
{
"anchor": "voltaic_pile",

View File

@ -1,13 +1,22 @@
{
"name": "Generators",
"icon": "nuclearcraft:solar_panel_basic",
"name": "Generators & Collectors",
"icon": "nuclearcraft:rtg_uranium",
"category": "nuclearcraft:machines",
"sortnum": 1,
"pages": [
{
"anchor": "intro",
"type": "text",
"text": "These blocks generate energy in relatively small quantities, but are also relatively easy to set up."
"text": "These blocks generate energy, items, or fluids, without needing any continuous input"
},
{
"anchor": "rtg",
"type": "machines/4_tier_machine",
"header": "RTGs",
"tier1": "nuclearcraft:rtg_uranium",
"tier2": "nuclearcraft:rtg_plutonium",
"tier3": "nuclearcraft:rtg_americium",
"tier4": "nuclearcraft:rtg_californium",
"text": "Radioisotope Thermoelectric Generators. Uses the heat produced by radioactive decay to generate energy"
},
{
"anchor": "solar_panel",
@ -17,14 +26,34 @@
"tier2": "nuclearcraft:solar_panel_advanced",
"tier3": "nuclearcraft:solar_panel_du",
"tier4": "nuclearcraft:solar_panel_elite",
"text": "Only generates energy during the day."
"text": "Generates energy only during the day"
},
{
"anchor": "decay_generator",
"type": "machines/single_machine",
"header": "Decay Generator",
"block": "nuclearcraft:decay_generator",
"text": "Generates energy from the decay of adjacent radioactive blocks."
{
"anchor": "cobblestone_generator",
"type": "machines/3_tier_machine",
"header": "Cobblestone Generators",
"tier1": "nuclearcraft:cobblestone_generator",
"tier2": "nuclearcraft:cobblestone_generator_compact",
"tier3": "nuclearcraft:cobblestone_generator_dense",
"text": "Combines lava and water to generate cobblestone"
},
{
"anchor": "water_source",
"type": "machines/3_tier_machine",
"header": "Water Sources",
"tier1": "nuclearcraft:water_source",
"tier2": "nuclearcraft:water_source_compact",
"tier3": "nuclearcraft:water_source_dense",
"text": "Uses the magic of infinite water sources to generate water"
},
{
"anchor": "nitrogen_collector",
"type": "machines/3_tier_machine",
"header": "Nitrogen Collectors",
"tier1": "nuclearcraft:nitrogen_collector",
"tier2": "nuclearcraft:nitrogen_collector_compact",
"tier3": "nuclearcraft:nitrogen_collector_dense",
"text": "Seperates out the nitrogen from the air"
}
]
}

View File

@ -1,27 +1,24 @@
{
"name": "Other Machines",
"name": "Other 'Machines'",
"icon": "nuclearcraft:bin",
"category": "nuclearcraft:machines",
"sortnum": 3,
"pages": [
{
"anchor": "intro",
"type": "text",
"text": "These are machine-like blocks that help in building a clean, efficient, nuclear-oriented factory."
"text": "These are machine-like blocks that help in building a clean and efficient factory"
},
{
"anchor": "machine_interface",
"type": "machines/single_machine",
"header": "Machine Interface",
"block": "nuclearcraft:machine_interface",
"text": "Extends a processor on one of its sides. Use if you have ran out of room for pipes or cables."
"text": "Extends a machine through one of its faces, in case you run out of room"
},
{
"anchor": "bin",
"type": "machines/single_machine",
"header": "Universal Bin",
"block": "nuclearcraft:bin",
"text": "Effectively a black hole in a box, it destroys all materials and energy fed to it."
"text": "A black hole in a box. Destroys everything inserted, including but not limited to: items, fluids, energy, ..."
}
]
}

View File

@ -2,152 +2,131 @@
"name": "Processors",
"icon": "nuclearcraft:manufactory",
"category": "nuclearcraft:machines",
"sortnum": 0,
"pages": [
{
"anchor": "intro",
"type": "text",
"text": "These machines process, well, almost anything! Some are very hot, others are very cold, most require energy, but they all transform stuff into other stuff."
},
{
"anchor": "nuclear_furnace",
"type": "machines/single_machine",
"header": "Nuclear Furnace",
"block": "nuclearcraft:nuclear_furnace",
"text": "Smelts items very quickly using uranium ingots and dust as fuel."
"text": "These machines process, well, almost anything! Some are very hot, others are very cold, most require energy, but they all transform stuff into other stuff"
},
{
"anchor": "manufactory",
"type": "machines/single_machine",
"header": "Manufactory",
"block": "nuclearcraft:manufactory",
"text": "A handy machine that has many uses."
"text": "Pulverises, saws, crushes... This is the most versatile machine, and will be one of the first you will make"
},
{
"anchor": "nuclear_furnace",
"type": "machines/single_machine",
"block": "nuclearcraft:nuclear_furnace",
"text": "Similar to a regular furnace, but it uses THE POWER OF RADIOACTIVITY to smelt stuff. Requires a nuclear fuel source to function."
},
{
"anchor": "separator",
"type": "machines/single_machine",
"header": "Separator",
"block": "nuclearcraft:separator",
"text": "Breaks materials into their constituents."
"text": "Reverse crafting table, in case you made too many of one fuel"
},
{
"anchor": "decay_hastener",
"type": "machines/single_machine",
"header": "Decay Hastener",
"block": "nuclearcraft:decay_hastener",
"text": "Forces radioactive materials to decay."
"text": "Speeds up the decay of radioactive materials"
},
{
"anchor": "fuel_reprocessor",
"type": "machines/single_machine",
"header": "Fuel Reprocessor",
"block": "nuclearcraft:fuel_reprocessor",
"text": "Extracts materials from depleted fuel."
"text": "Processes depleted fuel into new, more exciting (and more radioactive!) isotopes"
},
{
"anchor": "alloy_furnace",
"type": "machines/single_machine",
"header": "Alloy Furnace",
"block": "nuclearcraft:alloy_furnace",
"text": "Combines base metals into alloys."
"text": "Smelts 2 metals together"
},
{
"anchor": "fluid_infuser",
"type": "machines/single_machine",
"header": "Fluid Infuser",
"block": "nuclearcraft:infuser",
"text": "Enhances materials with fluids."
"text": "Infuses a fluid into an item, opposite of $(l:machines/processors#fluid_enricher)Fluid Enricher$(/l)"
},
{
"anchor": "melter",
"type": "machines/single_machine",
"header": "Melter",
"block": "nuclearcraft:melter",
"text": "Melts down materials."
"text": "Turns solids into liquids"
},
{
"anchor": "supercooler",
"type": "machines/single_machine",
"header": "Supercooler",
"block": "nuclearcraft:supercooler",
"text": "Lowers the temperature of fluids."
"text": "A very, very powerful freezer"
},
{
"anchor": "electrolyzer",
"type": "machines/single_machine",
"header": "Electrolyzer",
"block": "nuclearcraft:electrolyzer",
"text": "Splits compounds into their elements."
"text": "Uses the power of electricity to seperate molecules"
},
{
"anchor": "assembler",
"type": "machines/single_machine",
"header": "Assembler",
"block": "nuclearcraft:assembler",
"text": "Combines components into a complex product."
"text": "Combines multiple items into more complex components"
},
{
"anchor": "ingot_former",
"type": "machines/single_machine",
"header": "Ingot Former",
"block": "nuclearcraft:ingot_former",
"text": "Forms ingots and gems from molten materials."
"text": "Forms ingots from their molten counterparts. Does not require energy"
},
{
"anchor": "pressurizer",
"type": "machines/single_machine",
"header": "Pressurizer",
"block": "nuclearcraft:pressurizer",
"text": "Processes items under immense pressure."
"text": "Overpowered squeezer, capable of turning piles of dust into crystals"
},
{
"anchor": "chemical_reactor",
"type": "machines/single_machine",
"header": "Chemical Reactor",
"block": "nuclearcraft:chemical_reactor",
"text": "Houses reactions between fluids."
"text": "2 fluids react together to make 2 new fluids"
},
{
"anchor": "salt_mixer",
"type": "machines/single_machine",
"header": "Fluid Mixer",
"block": "nuclearcraft:salt_mixer",
"text": "Blends fluids together."
"text": "Mixes fluids together"
},
{
"anchor": "crystallizer",
"type": "machines/single_machine",
"header": "Crystallizer",
"block": "nuclearcraft:crystallizer",
"text": "Precipitates solids from solution."
"text": "Evaporates the water from solutions to form solids"
},
{
"anchor": "fluid_enricher",
"type": "machines/single_machine",
"header": "Fluid Enricher",
"block": "nuclearcraft:enricher",
"text": "Enriches fluids with materials."
"text": "Mixes items into fluids, opposite of $(l:machines/processors#fluid_infuser)Fluid Infuser$(/l)"
},
{
"anchor": "fluid_extractor",
"type": "machines/single_machine",
"header": "Fluid Extractor",
"block": "nuclearcraft:extractor",
"text": "Draws fluids from materials."
"text": "Extracts fluids from items"
},
{
"anchor": "centrifuge",
"type": "machines/single_machine",
"header": "Centrifuge",
"block": "nuclearcraft:centrifuge",
"text": "Separates the isotopes of fluid materials."
"text": "Very spinny. Seperates fluids through the use of centrifugal force"
},
{
"anchor": "rock_crusher",
"type": "machines/single_machine",
"header": "Rock Crusher",
"block": "nuclearcraft:rock_crusher",
"text": "Smashes up rock to produce mineral dusts."
"text": "Crushes rocks and seperates their dust"
}
]
}

View File

@ -1,8 +1,7 @@
{
"name": "Alloys",
"category": "nuclearcraft:materials",
"icon": "nuclearcraft:alloy:10",
"category": "nuclearcraft:basics_",
"sortnum": 2,
"pages": [
{
"anchor": "intro",

View File

@ -1,8 +1,7 @@
{
"name": "Gems and Crystals",
"name": "Crystals",
"category": "nuclearcraft:materials",
"icon": "nuclearcraft:gem:0",
"category": "nuclearcraft:basics_",
"sortnum": 3,
"pages":
[
{

View File

@ -1,13 +1,12 @@
{
"name": "Ores and Ingots",
"icon": "nuclearcraft:ore:3",
"category": "nuclearcraft:basics",
"sortnum": 1,
"name": "Ores and ingots",
"category": "nuclearcraft:materials",
"icon": "nuclearcraft:ore:4",
"pages": [
{
"anchor": "intro",
"type": "text",
"text": "This is a list of all ores naturally generated in NuclearCraft. Ores can be processed into dust and then smelted into ingots."
"text": "This is a list of all the ores that are naturally generated by Nuclearcraft. Ores can be processed into dust in the $(l:machines/processors#manufactory)Manufactory$(/l), and that dust can be smelted into ingots. Ingots themselves can be processed into dust in the Manufactory."
},
{
"anchor": "copper",

View File

@ -1,8 +1,7 @@
{
"name": "Other Materials",
"name": "Other Basic Materials",
"category": "nuclearcraft:materials",
"icon": "nuclearcraft:dust:8",
"category": "nuclearcraft:basics_",
"sortnum": 4,
"pages":
[
{

View File

@ -1,18 +0,0 @@
{
"name": "RTGs",
"icon": "nuclearcraft:rtg_uranium",
"category": "nuclearcraft:multiblocks",
"sortnum": 0,
"pages": [
{
"anchor": "rtg",
"type": "machines/4_tier_machine",
"header": "RTGs",
"tier1": "nuclearcraft:rtg_uranium",
"tier2": "nuclearcraft:rtg_plutonium",
"tier3": "nuclearcraft:rtg_americium",
"tier4": "nuclearcraft:rtg_californium",
"text": "These blocks generate energy from the decay of a radioisotope. They will form multiblocks if placed adjacent to each other."
}
]
}

View File

@ -1,8 +1,7 @@
{
"name": "Turbine",
"icon": "nuclearcraft:turbine_controller",
"category": "nuclearcraft:multiblocks",
"sortnum": 2,
"category": "nuclearcraft:turbine",
"pages": [
{
"type": "text",

View File

@ -2,7 +2,7 @@
"components": [
{
"type": "header",
"text": "#header",
"text": "#block->iname",
"x": -1,
"y": -1
},

View File

@ -16,7 +16,7 @@
},
{
"type": "item",
"item": "#dust",
"item": "#ingot",
"framed": true,
"link_recipe": true,
"x": 50,
@ -24,7 +24,7 @@
},
{
"type": "item",
"item": "#ingot",
"item": "#dust",
"framed": true,
"link_recipe": true,
"x": 70,

View File

@ -1,7 +1,3 @@
Tweak turbine coil and blade stats?
Revert to original conductor mechanics, i.e. used ot connect clusters to casing, but not to each other?
Move onAdded tile methods to onLoad()?
Refactor old tile entity hierarchy - modularise item/fluid/energy handling
Modularise processor classes