maxscout/Create-The_Factory_Must_Grow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

completely random improvements

Browse Source
This commit is contained in:
DrMangoTea
2023-11-16 18:00:16 +01:00
parent d4c971e4c3
commit 8452d3e167
16 changed files with 168 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9
View File

@@ -1,4 +1,4 @@
// 1.19.2 2023-11-12T13:28:07.3334941 Registrate Provider for createindustry [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
// 1.19.2 2023-11-16T14:05:17.9404943 Registrate Provider for createindustry [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
50db526af77cf0ead08cadfd3f7daa8b84a40312 assets/createindustry/blockstates/air_intake.json
429437419b2ec98bd716e7ba15583b84da7488d5 assets/createindustry/blockstates/aluminum_bars.json
9e2417e479011e42ebf00685068e6b6f515f0b11 assets/createindustry/blockstates/aluminum_block.json
@@ -849,7 +849,7 @@ ce4f2860cdc0feff4778dcca1fba56469a798d17 assets/createindustry/models/item/yello
22b37c38ee863195fba09737e007422e0af66916 assets/createindustry/models/item/zinc_grenade.json
d2674ab227f0eeb92258f423f03ef3286de168e3 data/createindustry/advancements/recipes/createindustry.base/aluminum_bars_from_ingots_aluminum_stonecutting.json
53b9aceb5cb31019574d63e722df0813affdcb40 data/createindustry/advancements/recipes/createindustry.base/aluminum_ladder_from_ingots_aluminum_stonecutting.json
f50de0b789099460649a63217be0dc7408315c0f data/createindustry/advancements/recipes/createindustry.base/aluminum_scaffolding_from_ingots_steel_stonecutting.json
009fd5fbd1380a356ff56b1789789c91cd4a50d7 data/createindustry/advancements/recipes/createindustry.base/aluminum_scaffolding_from_ingots_aluminum_stonecutting.json
676ffb2246d0d0077aaccc5f6f2de4481b09bdf9 data/createindustry/advancements/recipes/createindustry.base/steel_bars_from_ingots_steel_stonecutting.json
7f0a202e2cdf6c9d07aabbccb2de107f732da92d data/createindustry/advancements/recipes/createindustry.base/steel_ladder_from_ingots_steel_stonecutting.json
341d7345e8c6384c0a1b051f4e4d69b98c4e0089 data/createindustry/advancements/recipes/createindustry.base/steel_scaffolding_from_ingots_steel_stonecutting.json
@@ -1076,7 +1076,7 @@ a2696e4085c0b77fc25e5c760087a5c0740ccaeb data/createindustry/loot_tables/blocks/
a3522de85d35503a732771a67c7421e67ce9967f data/createindustry/loot_tables/blocks/yellow_concrete_wall.json
ba930ee89155dc321e546aef3df7e6275e7c8f3b data/createindustry/recipes/aluminum_bars_from_ingots_aluminum_stonecutting.json
9135989a22644e8676ab7dc6602b1a6aaf55badd data/createindustry/recipes/aluminum_ladder_from_ingots_aluminum_stonecutting.json
1bcf4805e427e68118785fc2a0f9debb953b3286 data/createindustry/recipes/aluminum_scaffolding_from_ingots_steel_stonecutting.json
73173b977371d01cc437cf583ce233b7a439c58a data/createindustry/recipes/aluminum_scaffolding_from_ingots_aluminum_stonecutting.json
50fedca289c3aae4c5a2aa5e4a9facb84c847da7 data/createindustry/recipes/bauxite_from_stone_types_bauxite_stonecutting.json
abee45903bfc415321b86d794bd4ddcd91532660 data/createindustry/recipes/bauxite_pillar_from_stone_types_bauxite_stonecutting.json
74f16377515e1dbbf6619bdf43ae3ea8e26dd651 data/createindustry/recipes/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json

4
src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e
View File

@@ -1,2 +1,2 @@
// 1.19.2 2023-11-12T13:28:07.3272281 Create: The Factory Must Grow's lang merger
022087a489e1759aa814291b8fcb1d396cd3e41a assets/createindustry/lang/en_us.json
// 1.19.2 2023-11-16T14:05:17.9855042 Create: The Factory Must Grow's lang merger
8022b7f5699915d93776d948467ffc363cef009e assets/createindustry/lang/en_us.json

132
src/generated/resources/assets/createindustry/lang/en_us.json
View File

@@ -287,6 +287,138 @@
"item.createindustry.unprocessed_heavy_plate": "Unprocessed Heavy Plate",
"item.createindustry.zinc_grenade": "Zinc Grenade",
"itemGroup.createindustry.base": "Create: The Factory Must Grow",
"itemGroup.createindustry.building": "Create: TFMG Building Blocks",
"create.goggles.misc.number": "%1$s",
"create.goggles.misc.percent_symbol": "%",
"create.goggles.misc.dot_one": ".",
"create.goggles.misc.dot_two": "..",
"create.goggles.misc.dot_three": "...",
"create.goggles.misc.storage_info": "Storage Info:",
"create.goggles.fluid_in_tank": "Tank Contents:",
"create.goggles.surface_scanner.no_rotation": "Machine Unpowered",
"create.goggles.surface_scanner.no_deposit": "No Deposit Found",
"create.goggles.surface_scanner.deposit_found": "Deposit Located!",
"create.goggles.surface_scanner.distance": "Distance: %1$s Blocks",
"create.goggles.surface_scanner.scanning_surface": "Scanning The Surface...",
"create.goggles.distillation_tower.status": "Distillation Tower Info:",
"create.goggles.distillation_tower.tank_not_found": "Steel Fluid Tank Not Found",
"create.goggles.distillation_tower.not_tall_enough": "The Fluid Tank is Too Short",
"create.goggles.distillation_tower.level": "Distillation Tower Level: %1$s",
"create.goggles.distillation_tower.found_outputs": "Number of Outputs: %1$s",
"create.goggles.distillation_tower.no_outputs": "No Output Blocks Found",
"create.goggles.blast_furnace.stats": "Blast Furnace:",
"create.goggles.blast_furnace.size_stats": "Size:",
"create.goggles.blast_furnace.fuel_amount": "Fuel Amount: %1$s",
"create.goggles.blast_furnace.item_count": "Item Count: %1$s",
"create.goggles.blast_furnace.height": "Height: %1$s",
"create.goggles.blast_furnace.nothing_lol": "",
"create.goggles.blast_furnace.status.off": "Status: Idle",
"create.goggles.blast_furnace.status.running": "Status: Running",
"create.goggles.blast_furnace.diameter.one": "Diameter: 1",
"create.goggles.blast_furnace.diameter.two": "Diameter: 2",
"create.goggles.blast_furnace.invalid": "Blast Furnace Invalid",
"create.goggles.coke_oven.status": "Coke Oven:",
"create.goggles.coke_oven.fluid_amount_output": "Internal Tank Contents: %1$s mb",
"create.goggles.coke_oven.fluid_amount_exhaust": "Carbon Dioxide: %1$s mb",
"create.goggles.coke_oven.item_count": "Internal Storage Item Count: %1$s",
"create.goggles.coke_oven.invalid": "Coke Oven Invalid",
"create.goggles.coke_oven.tank_full": "An Internal Tank is Full",
"create.goggles.coke_oven.progress": "Progress: %1$s",
"create.goggles.engine_stats": "Engine Stats:",
"create.goggles.engine_exhaust_stats": "Engine Exhaust Stats:",
"create.goggles.fuel_container": "Fluid Storage",
"create.goggles.engine.backpartmissing": "Back Part Missing:",
"create.goggles.engine_redstone_input": "Speed:",
"create.goggles.engine.efficiency": "Efficiency:",
"create.tooltip.engine_analog_strength": "%1$s/15",
"create.goggles.get_engine_efficiency": "%1$s",
"create.goggles.engine.stress": "%1$ssu",
"create.goggles.diesel_engine.info": "Diesel Engine:",
"create.goggles.pumpjack_info": "Pumpjack Info:",
"create.goggles.pumpjack.part_missing": "Hammer or Crank Missing",
"create.goggles.pumpjack.wrong_rotation1": "The Pumpjack Base is oriented incorrectly, the red marker must",
"create.goggles.pumpjack.wrong_rotation2": "face away from the Pumpjack Hammer Holder",
"create.goggles.pumpjack_fluid_storage": "Fluid Tank Info:",
"create.pumpjack_deposit_amount": "%1$s Buckets",
"create.goggles.pumpjack.deposit_info": "Deposit Info:",
"create.goggles.zero": "No Deposit Found",
"create.goggles.pumpjack.fluid_amount": "Fluid Amount:",
"create.goggles.machine_input.info": "Machine Input Info",
"create.goggles.machine_input.no_rot": "No Rotation Provided!",
"create.goggles.machine_input.power_level": "Power Level: ",
"create.recipe.distillation": "Distillation",
"create.recipe.advanced_distillation": "Advanced Distillation",
"create.recipe.industrial_blasting": "Industrial Blasting",
"create.recipe.casting": "Casting",
"create.recipe.coking": "Coking",
"createindustry.ponder.small_engines.text_1": "To create a small engine, place the front and back parts adjacent to eachother",
"createindustry.ponder.small_engines.text_2": "Fuel is inputted into the front part, and exhaust must be removed from the back part using pipes and an exhaust block",
"createindustry.ponder.small_engines.text_3": "Applying a redstone signal to the front part starts the engine",
"createindustry.ponder.small_engines.text_4": "Small engines include LPG, kerosene and gasoline engines",
"createindustry.ponder.diesel_engine.text_1": "Diesel Engines are assembled by placing a shaft infront of a Diesel Engine block",
"createindustry.ponder.diesel_engine.text_2": "The engine produces exhaust gas which has to be removed with pipes and an exhaust block",
"createindustry.ponder.diesel_engine.text_3": "Air is needed for the engine to run, so an Air Intake is required",
"createindustry.ponder.diesel_engine_expansion.text_1": "Diesel Engine Expansions can give a Diesel Engine two new input slots, for lubrication and radiator fluids",
"createindustry.ponder.surface_scanner.text_1": "The Surface Scanner is used to locate crude oil deposits",
"createindustry.ponder.surface_scanner.text_2": "Providing the machine with rotational power makes it scan for the nearest deposit",
"createindustry.ponder.surface_scanner.text_3": "If a deposit is found, the compass will point towards its location",
"createindustry.ponder.pumpjack.text_1": "To start extracting Oil, you must first build a pipeline on top of a deposit using Industrial Pipes",
"createindustry.ponder.pumpjack.text_2": "Then, construct a Pumpjack on top of the pipeline by first placing down a Pumpjack Base...",
"createindustry.ponder.pumpjack.text_3": "Placing the Pumpjack Hammer behind it...",
"createindustry.ponder.pumpjack.text_4": "And finally, placing the Machine Input with a Pumpjack Crank above it, as shown in the scene",
"createindustry.ponder.distillation_tower.text_1": "A sufficiently large Steel Fluid Tank can be turned into a Distillation Tower",
"createindustry.ponder.distillation_tower.text_2": "The tower is assembled by first placing a Steel Distillation Tower Controller next to the tank...",
"createindustry.ponder.distillation_tower.text_3": "And placing up to 6 Distillation Tower Outputs, all connected with Industrial Pipes",
"createindustry.ponder.distillation_tower.text_4": "Blaze Burners are required to run the Distillation Tower. The dial displays current power levels",
"createindustry.ponder.distillation_tower.text_5": "To input Crude Oil, it must be pumped into the controller block",
"createindustry.ponder.distillation_tower.text_6": "Each output block provides one of the Oil byproducts",
"createindustry.ponder.distillation_tower.text_7": "LPG",
"createindustry.ponder.distillation_tower.text_8": "Gasoline",
"createindustry.ponder.distillation_tower.text_9": "Naphtha",
"createindustry.ponder.distillation_tower.text_10": "Kerosene",
"createindustry.ponder.distillation_tower.text_11": "Diesel",
"createindustry.ponder.distillation_tower.text_12": "Heavy Oil",
"createindustry.ponder.blast_furnace.text_1": "The base of the Blast Furnace is a Blast Furnace Output block",
"createindustry.ponder.blast_furnace.text_2": "To assemble a Blast Furnace, construct a chimney using Fireproof Bricks as shown in the scene",
"createindustry.ponder.blast_furnace.text_3": "The bottom half of the chimney requires to be reinforced",
"createindustry.ponder.blast_furnace.text_4": "Fuel and other items are inserted through the opening at the top",
"createindustry.ponder.coke_oven.text_1": "The Coke Oven is built by placing Coke Oven blocks as shown in the scene, and clicking its side with a wrench",
"createindustry.ponder.coke_oven.text_2": "The process of coking is slow, so it is more efficient to have long arrays of ovens working simultaneously",
"createindustry.ponder.coke_oven.text_3": "Coal can be inputted from any side",
"createindustry.ponder.coke_oven.text_4": "While running, the oven produces Creosote and CO2 which have to be pumped out for it to function",
"createindustry.ponder.coke_oven.text_5": "Once done, Coal Coke will drop out of the opening",
"createindustry.ponder.casting.text_1": "Casting is the process of pouring liquid metal into a Casting Basin using a Casting Spout",
"createindustry.ponder.casting.text_2": "The Casting Basin, obviously, requires a mold to function",
"createindustry.ponder.distillation_tower.header": "Distillation Tower Setup",
"createindustry.ponder.pumpjack.header": "Building Pumpjacks",
"createindustry.ponder.surface_scanner.header": "Locating Oil",
"createindustry.ponder.diesel_engine.header": "Building a Diesel Engine",
"createindustry.ponder.diesel_engine_expansion.header": "Expanding Diesel Engines",
"createindustry.ponder.small_engines.header": "Building Small Engines",
"createindustry.ponder.coke_oven.header": "Building a Coke Oven",
"createindustry.ponder.blast_furnace": "Building a Blast Furnace",
"createindustry.ponder.casting.header": "Casting Metal",
"createindustry.ponder.tag.oil": "Oil Related Machines",
"createindustry.ponder.tag.metallurgy": "Metal Working Machines",
"createindustry.ponder.tag.oil.description": "Machines that extract, process or use Crude Oil and its byproducts",
"createindustry.ponder.tag.metallurgy.description": "Machines that produce, process or use Metal and raw materials as such",
"_": "->------------------------] UI & Messages [------------------------<-",

32
src/generated/resources/data/createindustry/advancements/recipes/createindustry.base/aluminum_scaffolding_from_ingots_steel_stonecutting.json
View File

@@ -1,32 +0,0 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots_steel": {
"conditions": {
"items": [
{
"tag": "forge:ingots/steel"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "createindustry:aluminum_scaffolding_from_ingots_steel_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingots_steel",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"createindustry:aluminum_scaffolding_from_ingots_steel_stonecutting"
]
}
}

4
src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/casting_basin/CastingBasinBlockEntity.java
View File

@@ -83,9 +83,9 @@ public class CastingBasinBlockEntity extends TFMGMachineBlockEntity implements I
setMold();
if(tank1.isEmpty()){
//if(tank1.isEmpty()){
setCapacity();
}
//}
if(type==MoldType.NONE)
return;

6
src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/coke_oven/CokeOvenBlockEntity.java
View File

@@ -128,7 +128,7 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren
/////
RecipeWrapper inventoryIn = new RecipeWrapper(inputInventory);
if ((lastRecipe == null || !lastRecipe.matches(inventoryIn, level))&&timer==-1) {
if (lastRecipe == null || !lastRecipe.matches(inventoryIn, level)&&timer==-1) {
Optional<CokingRecipe> recipe = TFMGRecipeTypes.COKING.find(inventoryIn, level);
if (!recipe.isPresent()) {
timer = -1;
@@ -187,14 +187,14 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren
if(lastRecipe!=null
&&isController
&&timer==-1
&&inputInventory.getItem(0).getCount()>=5&&
&&inputInventory.getItem(0).getCount()>=1&&
(tank2.getPrimaryHandler().getFluidAmount()+CARBON_DIOXIDE_PRODUCTION)<=tank2.getPrimaryHandler().getCapacity()&&
(tank1.getPrimaryHandler().getFluidAmount()+lastRecipe.getFluidResults().get(0).getAmount())<=tank1.getPrimaryHandler().getCapacity(
)){
timer = lastRecipe.getProcessingDuration();
inputInventory.setItem(0,new ItemStack(inputInventory.getItem(0).getItem(),inputInventory.getItem(0).getCount()-5));
inputInventory.setItem(0,new ItemStack(inputInventory.getItem(0).getItem(),inputInventory.getItem(0).getCount()-1));
}
// if(lastRecipe != null)

14
src/main/java/com/drmangotea/createindustry/recipes/jei/CastingCategory.java
View File

@@ -36,10 +36,18 @@ public class CastingCategory extends CreateRecipeCategory<CastingRecipe> {
int y = 77;
for(int i = 0;i<CastingRecipe.getOutputCount(recipe);i++) {
builder
ItemStack stack;
if (i == 1) {
stack = recipe.getBlockResult();
} else
stack = recipe.getIngotResult();
builder
.addSlot(RecipeIngredientRole.OUTPUT, 130, y)
.setBackground(getRenderedSlot(), -1, -1)
.addItemStack(recipe.getResultItem());
.addItemStack(stack);
ItemStack mold= TFMGItems.INGOT_MOLD.asStack();
@@ -63,7 +71,7 @@ public class CastingCategory extends CreateRecipeCategory<CastingRecipe> {
.addSlot(RecipeIngredientRole.INPUT, 2, 33)
.setBackground(getRenderedSlot(), -1, -1)
.addIngredients(ForgeTypes.FLUID_STACK, withImprovedVisibility(recipe.getInputFluid().getMatchingFluidStacks()))
.addTooltipCallback(addFluidTooltip(recipe.getInputFluid().getRequiredAmount()));
.addTooltipCallback(addFluidTooltip(111));
}

6
src/main/resources/data/createindustry/recipes/coking/coal_coke.json
View File

@@ -2,20 +2,20 @@
"type": "createindustry:coking",
"ingredients": [
{
"count": 5,
"count": 1,
"item": "minecraft:coal"
}
],
"processingTime": 1000,
"results": [
{
"count": 5,
"count": 1,
"item": "createindustry:coal_coke"
}
,
{
"fluid": "createindustry:creosote",
"amount": 4
"amount": 1
}
]

4
src/main/resources/data/createindustry/recipes/crushing/lignite.json
View File

@@ -8,10 +8,6 @@
"results": [
{
"item": "minecraft:coal"
},
{
"item": "minecraft:coal",
"chance": 0.5
}
],
"processingTime": 250

2
src/main/resources/data/createindustry/recipes/crushing/sulfur.json
View File

@@ -11,7 +11,7 @@
},
{
"item": "createindustry:sulfur_dust",
"chance": 0.7
"chance": 0.1
}
],
"processingTime": 250

19
src/main/resources/data/createindustry/recipes/filling/liquid_asphalt_bucket.json
View File

@@ -1,19 +0,0 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"fluid": "createindustry:liquid_asphalt",
"nbt": {},
"amount": 200
}
],
"results": [
{
"item": "createindustry:liquid_asphalt_bucket"
}
]
}

19
src/main/resources/data/createindustry/recipes/filling/liquid_concrete_bucket.json
View File

@@ -1,19 +0,0 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"fluid": "createindustry:liquid_concrete",
"nbt": {},
"amount": 200
}
],
"results": [
{
"item": "createindustry:liquid_concrete_bucket"
}
]
}

4
src/main/resources/data/createindustry/recipes/mechanical_crafting/engine_chamber.json
View File

@@ -2,7 +2,6 @@
"type": "create:mechanical_crafting",
"pattern": [
" S ",
" I ",
" A ",
" P "
],
@@ -15,9 +14,6 @@
"A": {
"tag": "forge:ingots/aluminum"
},
"I": {
"tag": "forge:ingots/steel"
},
"P": {
"item": "createindustry:steel_mechanism"
}

2
src/main/resources/data/createindustry/recipes/sequenced_assembly/steel_mechanism.json
View File

@@ -96,5 +96,5 @@
"item": "createindustry:industrial_pipe"
}
],
"loops": 2
"loops": 1
}

9
src/main/resources/data/createindustry/recipes/stonecutting/factory_floor_aluminum.json Normal file
View File

@@ -0,0 +1,9 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"tag": "forge:ingots/aluminum"
},
"result": "createindustry:factory_floor",
"count": 4
}

2
src/main/resources/data/createindustry/recipes/stonecutting/industrial_pipe.json
View File

@@ -5,5 +5,5 @@
"tag": "forge:ingots/steel"
},
"result": "createindustry:industrial_pipe",
"count": 4
"count": 8
}