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

pipe fix

Browse Source
This commit is contained in:
DrMangoTea
2023-11-01 20:53:02 +01:00
parent ea3952297c
commit 08131ec23a
75 changed files with 1408 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java
View File

@@ -492,9 +492,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
Lang.translate("goggles.blast_furnace.height", engineStrength)
.style(ChatFormatting.DARK_PURPLE)
.forGoggles(tooltip, 1);
@@ -509,7 +507,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
return false;
LangBuilder mb = Lang.translate("generic.unit.millibuckets");
Lang.translate("goggles.diesel_engine_info")
Lang.translate("goggles.diesel_engine.info")
.style(ChatFormatting.GRAY)
.forGoggles(tooltip);

3
src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java
View File

@@ -387,6 +387,9 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
Lang.translate("goggles.blast_furnace.fuel_amount", fuelInventory.getStackInSlot(0).getCount())
.style(ChatFormatting.AQUA)
.forGoggles(tooltip, 1);
Lang.translate("goggles.blast_furnace.nothing_lol")
.style(ChatFormatting.AQUA)
.forGoggles(tooltip, 1);
}

5
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/aluminum/AluminumPipeAttachmentModel.java
View File

@@ -58,8 +58,9 @@ public class AluminumPipeAttachmentModel extends BakedModelWrapperWithData {
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
if(state.getBlock() instanceof FluidPipeBlock)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)

5
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/brass/BrassPipeAttachmentModel.java
View File

@@ -58,8 +58,9 @@ public class BrassPipeAttachmentModel extends BakedModelWrapperWithData {
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
if(state.getBlock() instanceof FluidPipeBlock)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)

5
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/cast_iron/CastIronPipeAttachmentModel.java
View File

@@ -58,8 +58,9 @@ public class CastIronPipeAttachmentModel extends BakedModelWrapperWithData {
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
if(state.getBlock() instanceof FluidPipeBlock)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)

5
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/plastic/PlasticPipeAttachmentModel.java
View File

@@ -58,8 +58,9 @@ public class PlasticPipeAttachmentModel extends BakedModelWrapperWithData {
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
if(state.getBlock() instanceof FluidPipeBlock)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)

5
src/main/java/com/drmangotea/createindustry/mixins/PipeAttachmentModelMixin.java
View File

@@ -73,8 +73,9 @@ public class PipeAttachmentModelMixin extends BakedModelWrapperWithData {
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
if(state.getBlock() instanceof FluidPipeBlock)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)

4
src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java
View File

@@ -489,10 +489,10 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
REGISTRATE.block("steel_distillation_output", DistillationOutputBlock::new)
.initialProperties(SharedProperties::copperMetal)
.properties(p -> p.color(MaterialColor.STONE))
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
.blockstate(BlockStateGen.horizontalBlockProvider(true))
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(pickaxeOnly())
.item(AssemblyOperatorBlockItem::new)
.item()
.build()
.register();
public static final BlockEntry<DistillationControllerBlock> STEEL_DISTILLATION_CONTROLLER =

5
src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java
View File

@@ -32,7 +32,8 @@ public class TFMGItems {
STEEL_INGOT = taggedIngredient("steel_ingot", forgeItemTag("ingots/steel"), CREATE_INGOTS.tag),
CAST_IRON_INGOT = taggedIngredient("cast_iron_ingot", forgeItemTag("ingots/cast_iron"), CREATE_INGOTS.tag),
ALUMINUM_INGOT = taggedIngredient("aluminum_ingot", forgeItemTag("ingots/aluminum"), CREATE_INGOTS.tag),
PLASTIC_SHEET = taggedIngredient("plastic_sheet", forgeItemTag("ingots/plastic"), CREATE_INGOTS.tag)
PLASTIC_SHEET = taggedIngredient("plastic_sheet", forgeItemTag("ingots/plastic"), CREATE_INGOTS.tag),
CHARCOAL_DUST = taggedIngredient("charcoal_dust", forgeItemTag("dusts/charcoal"))
// LEAD_INGOT = taggedIngredient("lead_ingot", forgeItemTag("ingots/lead"), CREATE_INGOTS.tag)
;
@@ -56,7 +57,7 @@ public class TFMGItems {
TURBINE_BLADE = REGISTRATE.item("turbine_blade", Item::new).register(),
THERMITE_POWDER = REGISTRATE.item("thermite_powder", Item::new).register(),
STEEL_MECHANISM = REGISTRATE.item("steel_mechanism", Item::new).register(),
CHARCOAL_DUST = REGISTRATE.item("charcoal_dust", Item::new).register(),
NITRATE_DUST = REGISTRATE.item("nitrate_dust", Item::new).register(),
SULFUR_DUST = REGISTRATE.item("sulfur_dust", Item::new).register();

16
src/main/resources/assets/createindustry/lang/default/interface.json
View File

@@ -24,6 +24,7 @@
"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",
@@ -44,5 +45,18 @@
"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.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: "
}

35
src/main/resources/data/createindustry/recipes/fractional_distillation/crude_oil_sus.json Normal file
View File

@@ -0,0 +1,35 @@
{
"type": "createindustry:advanced_distillation",
"ingredients": [
{
"fluid": "createindustry:crude_oil_fluid",
"nbt": {},
"amount": 12
}
],
"results": [
{
"fluid": "createindustry:heavy_oil",
"amount": 3
},
{
"fluid": "createindustry:diesel",
"amount": 2
},
{
"fluid": "createindustry:kerosene",
"amount": 1
},
{
"fluid": "createindustry:gasoline",
"amount": 3
},
{
"fluid": "createindustry:lpg",
"amount": 2
}
]
}