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

some fixes

Browse Source
This commit is contained in:
DrMangoTea
2025-05-25 16:46:22 +02:00
parent fe9986f06b
commit 8b566a64f5
95 changed files with 19053 additions and 21152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/drmangotea/tfmg/base/TFMGCreativeTabs.java
View File

@@ -88,7 +88,8 @@ public class TFMGCreativeTabs {
List<RegistryEntry<? extends Item>> list = new ArrayList<>();
list.add(TFMGItems.LIT_LITHIUM_BLADE);
list.add(TFMGItems.GOLDEN_TURBO);
list.add(TFMGItems.DEPOSIT_ITEM);
return list;
}
@@ -97,8 +98,19 @@ public class TFMGCreativeTabs {
CompoundTag gasolineTag = new CompoundTag();
gasolineTag.putString("gasoline", "forge:gasoline");
gasolineTag.putString("kerosene", "forge:kerosene");
gasolineTag.putString("naphtha", "forge:naphtha");
CompoundTag gasolineTagName = new CompoundTag();
gasolineTagName.putString("gasoline", "Gasoline");
gasolineTagName.putString("kerosene", "Kerosene");
gasolineTagName.putString("naphtha", "Naphtha");
//
CompoundTag creosoteTag = new CompoundTag();
creosoteTag.putString("creosote", "forge:creosote");
creosoteTag.putString("furnace_gas", "forge:furnace_gas");
CompoundTag creosoteTagName = new CompoundTag();
creosoteTagName.putString("creosote", "Creosote");
creosoteTagName.putString("furnace_gas", "Furnace Gas");
//
CompoundTag dieselTag = new CompoundTag();
dieselTag.putString("diesel", "forge:diesel");
@@ -113,19 +125,15 @@ public class TFMGCreativeTabs {
CompoundTag keroseneTag = new CompoundTag();
keroseneTag.putString("kerosene", "forge:kerosene");
CompoundTag keroseneTagName = new CompoundTag();
keroseneTagName.putString("kerosene", "KEROSENE");
//
CompoundTag naphthaTag = new CompoundTag();
naphthaTag.putString("naphtha", "forge:naphtha");
CompoundTag naphthaTagName = new CompoundTag();
naphthaTagName.putString("naphtha", "NAPHTHA");
keroseneTagName.putString("kerosene", "Kerosene");
//
ItemStack gasoline = TFMGItems.ENGINE_CYLINDER.asStack();
gasoline.getOrCreateTag().put("Fuels", gasolineTag);
gasoline.getOrCreateTag().put("FuelNames", gasolineTagName);
list.add(gasoline);
ItemStack diesel = TFMGItems.ENGINE_CYLINDER.asStack();
ItemStack diesel = TFMGItems.DIESEL_ENGINE_CYLINDER.asStack();
diesel.getOrCreateTag().put("Fuels", dieselTag);
diesel.getOrCreateTag().put("FuelNames", dieselTagName);
list.add(diesel);
@@ -133,6 +141,16 @@ public class TFMGCreativeTabs {
lpg.getOrCreateTag().put("Fuels", lpgTag);
lpg.getOrCreateTag().put("FuelNames", lpgTagName);
list.add(lpg);
ItemStack creosote = TFMGItems.SIMPLE_ENGINE_CYLINDER.asStack();
creosote.getOrCreateTag().put("Fuels", creosoteTag);
creosote.getOrCreateTag().put("FuelNames", creosoteTagName);
list.add(creosote);
ItemStack kerosene = TFMGItems.TURBINE_BLADE.asStack();
kerosene.getOrCreateTag().put("Fuels", keroseneTag);
kerosene.getOrCreateTag().put("FuelNames", keroseneTagName);
list.add(kerosene);
return list;
}

7
src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorBlockEntity.java
View File

@@ -83,6 +83,11 @@ public class AccumulatorBlockEntity extends ElectricBlockEntity {
@Override
public boolean makeMultimeterTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
if(!isController())
if(level.getBlockEntity(controller) instanceof AccumulatorBlockEntity be)
return be.makeMultimeterTooltip(tooltip, isPlayerSneaking);
super.makeMultimeterTooltip(tooltip, isPlayerSneaking);
@@ -288,7 +293,7 @@ public class AccumulatorBlockEntity extends ElectricBlockEntity {
public int getChargingRate() {
//
// int chargingRate = Math.max((data.networkPowerGeneration - getNetworkPowerUsage()), 0);
if (energy.getEnergyStored() == getMaxCapacity() || getData().getVoltage() < getOutputVoltage() || canPower()|| data.notEnoughtPower)
if (energy.getEnergyStored() >= getMaxCapacity() || getData().getVoltage() < getOutputVoltage() || canPower()|| data.notEnoughtPower)
return 0;
//return Math.min(chargingRate, getMaxChargingRate());

22
src/main/java/com/drmangotea/tfmg/content/engines/base/AbstractEngineBlockEntity.java
View File

@@ -88,8 +88,10 @@ public abstract class AbstractEngineBlockEntity extends KineticElectricBlockEnti
}
public void tankUpdated(FluidStack stack, boolean fuelTank ) {
if(fuelTank && stack.isEmpty())
if(fuelTank && stack.isEmpty()) {
fuelInjectionRate = 0;
updateRotation();
}
sendData();
setChanged();
}
@@ -125,14 +127,14 @@ public abstract class AbstractEngineBlockEntity extends KineticElectricBlockEnti
}
@Override
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
CreateLang.text("SIGNAL " + highestSignal).forGoggles(tooltip);
return super.addToGoggleTooltip(tooltip, isPlayerSneaking);
}
//@Override
//public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
//
// CreateLang.text("SIGNAL " + highestSignal).forGoggles(tooltip);
//
//
// return super.addToGoggleTooltip(tooltip, isPlayerSneaking);
//}
@Override
@@ -147,7 +149,7 @@ public abstract class AbstractEngineBlockEntity extends KineticElectricBlockEnti
}
public void manageFuelAndExhaust() {
exhaustTank.forceFill(new FluidStack(TFMGFluids.CARBON_DIOXIDE.get(), Math.min(300, getFuelConsumption() * 7)), IFluidHandler.FluidAction.EXECUTE);
exhaustTank.forceFill(new FluidStack(TFMGFluids.CARBON_DIOXIDE.get(), Math.min(300, getFuelConsumption())), IFluidHandler.FluidAction.EXECUTE);
if (fuelConsumptionTimer <= 2) {
fuelConsumptionTimer++;

1
src/main/java/com/drmangotea/tfmg/content/engines/base/EngineBlock.java
View File

@@ -62,6 +62,7 @@ public class EngineBlock extends HorizontalKineticBlock {
engineController.accelerationRate = 0;
engineController.shift = TransmissionUpgrade.TransmissionState.NEUTRAL;
be.shift = TransmissionUpgrade.TransmissionState.NEUTRAL;
be.clutchPressed = false;
engineController.engine = null;
engineController.enginePos = null;
engineController.disconnectEngine();

45
src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java
View File

@@ -131,6 +131,7 @@ public class EngineControllerBlockEntity extends SmartBlockEntity implements IHa
if (enginePos != null)
if (level.getBlockEntity(enginePos) instanceof AbstractSmallEngineBlockEntity be) {
be.getControllerBE().shift = shift;
be.getControllerBE().clutchPressed = clutch;
be.getControllerBE().updateGeneratedRotation();
if(be.getControllerBE().engineLength()>1){
if(level.getBlockEntity(BlockPos.of(be.getControllerBE().engines.get(be.getControllerBE().engineLength()-1)))instanceof AbstractSmallEngineBlockEntity be2){
@@ -230,28 +231,28 @@ public class EngineControllerBlockEntity extends SmartBlockEntity implements IHa
disconnectEngine();
}
@Override
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
if (engine != null) {
CreateLang.text("Linked").forGoggles(tooltip);
}
CreateLang.text(shift.name()).forGoggles(tooltip);
CreateLang.text(engineStarted ? "Engine Started" : "Engine Stopped").forGoggles(tooltip);
CreateLang.text("Acceleration: " + accelerationRate).forGoggles(tooltip);
if (clutch)
CreateLang.text("CLUTCH").forGoggles(tooltip);
if (brake)
CreateLang.text("BRAKE").forGoggles(tooltip);
if (gas)
CreateLang.text("GAS").forGoggles(tooltip);
return true;
}
//@Override
//public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
//
// if (engine != null) {
// CreateLang.text("Linked").forGoggles(tooltip);
// }
//
//
// CreateLang.text(shift.name()).forGoggles(tooltip);
// CreateLang.text(engineStarted ? "Engine Started" : "Engine Stopped").forGoggles(tooltip);
// CreateLang.text("Acceleration: " + accelerationRate).forGoggles(tooltip);
//
//
// if (clutch)
// CreateLang.text("CLUTCH").forGoggles(tooltip);
// if (brake)
// CreateLang.text("BRAKE").forGoggles(tooltip);
// if (gas)
// CreateLang.text("GAS").forGoggles(tooltip);
//
// return true;
//}
@Override

4
src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java
View File

@@ -50,6 +50,7 @@ public abstract class AbstractSmallEngineBlockEntity extends AbstractEngineBlock
public Optional<? extends EngineUpgrade> upgrade = Optional.empty();
public TransmissionUpgrade.TransmissionState shift = TransmissionUpgrade.TransmissionState.NEUTRAL;
public boolean clutchPressed = false;
public int oil = 0;
@@ -354,6 +355,9 @@ public abstract class AbstractSmallEngineBlockEntity extends AbstractEngineBlock
if (getControllerBE().hasEngineController()) {
if(getControllerBE().hasTwoShafts())
speed = switch (getControllerBE().shift) {
case REVERSE -> speed * -0.3f;
case NEUTRAL -> 0;

7
src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java
View File

@@ -128,7 +128,7 @@ public class LargeEngineBlockEntity extends AbstractEngineBlockEntity {
@Override
public float efficiencyModifier() {
return 1;
return 0.5f;
}
@Override
@@ -296,8 +296,11 @@ public class LargeEngineBlockEntity extends AbstractEngineBlockEntity {
if(getShaft()==null)
return 0;
if(isSimpleEngine())
if(isSimpleEngine()&&getShaft()!=null)
return (int) getShaft().getGeneratedSpeed()/10;
if(getShaft()==null)
return 0;
return (int) getShaft().getGeneratedSpeed()/40;
}

3
src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java
View File

@@ -281,7 +281,8 @@ public class RegularEngineBlockEntity extends AbstractSmallEngineBlockEntity {
@OnlyIn(Dist.CLIENT)
private void makeSound(){
soundTimer++;
if(!isController())
return;
if(soundTimer>1/Math.min(6000,(rpm*0.0002)*pistonInventory.getSlots())) {

6
src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java
View File

@@ -119,6 +119,12 @@ public class BlastFurnaceOutputBlockEntity extends SmartBlockEntity implements I
CreateLang.translate("goggles.blast_furnace.fuel_amount", fuel)
.forGoggles(tooltip, 1);
if (timer != -1)
CreateLang.translate("goggles.blast_furnace.timer", timer)
.style(ChatFormatting.GOLD)
.forGoggles(tooltip, 1);
if (isReinforced)
CreateLang.translate("goggles.blast_furnace.reinforced")
.style(ChatFormatting.GREEN)

65
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java
View File

@@ -122,7 +122,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
CAST_IRON_FLYWHEEL = create(TFMGBlocks.CAST_IRON_FLYWHEEL)
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('C', leadIngot())
.define('C', castIronIngot())
.define('S', shaft())
.pattern("CCC")
.pattern("CSC")
@@ -326,7 +326,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("S ")
.pattern("S ")),
/// ////////////
STEEL_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0))
STEEL_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0)).returns(4)
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShaped(b -> b
.define('I', steelIngot())
@@ -366,7 +366,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.requires(ironSheet())
.requires(steelPipe())),
/// ////////////
ALUMINUM_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0))
ALUMINUM_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0)).returns(4)
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
.define('I', aluminumIngot())
@@ -406,7 +406,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.requires(ironSheet())
.requires(aluminumPipe())),
/// ////////////
PLASTIC_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0))
PLASTIC_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0)).returns(4)
.unlockedBy(TFMGItems.PLASTIC_SHEET::get)
.viaShaped(b -> b
.define('I', plasticSheet())
@@ -444,7 +444,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.requires(ironSheet())
.requires(plasticPipe())),
/// ////////////
BRASS_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0))
BRASS_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0)).returns(4)
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
@@ -484,11 +484,11 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.requires(ironSheet())
.requires(brassPipe())),
/// ////////////
CAST_IRON_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0))
CAST_IRON_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0)).returns(4)
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
.define('P', brassSheet())
.define('I', castIronIngot())
.define('P', castIronSheet())
.pattern(" ")
.pattern("PIP")
.pattern(" ")),
@@ -496,8 +496,8 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
CAST_IRON_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0)).withSuffix("_vertical")
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
.define('P', brassSheet())
.define('I', castIronIngot())
.define('P', castIronSheet())
.pattern("P")
.pattern("I")
.pattern("P")),
@@ -506,14 +506,14 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShapeless(b -> b
.requires(cog())
.requires(brassPipe())),
.requires(castIronPipe())),
CAST_IRON_SMART_FLUID_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(4))
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('P', electronTube())
.define('S', brassPipe())
.define('I', brassSheet())
.define('S', castIronPipe())
.define('I', castIronSheet())
.pattern("I")
.pattern("S")
.pattern("P")),
@@ -522,7 +522,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShapeless(b -> b
.requires(ironSheet())
.requires(brassPipe())),
.requires(castIronPipe())),
/// ////////////
STEEL_COGWHEEL = create(TFMGBlocks.STEEL_COGWHEEL).returns(4)
@@ -856,6 +856,15 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern(" I ")
.pattern(" ")),
SCREWDRIVER_FROM_BRASS = create(TFMGItems.SCREWDRIVER).withSuffix("from_brass")
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
.define('R', rebar())
.pattern(" R")
.pattern(" I ")
.pattern(" ")),
ELECTRIC_GAUGE = create(TFMGBlocks.VOLTMETER)
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
@@ -1301,14 +1310,36 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.viaCooking(() -> TFMGItems.RAW_LEAD)
.inFurnace(),
NICKEL_LEAD = create(TFMGItems.NICKEL_INGOT::get)
NICKEL = create(TFMGItems.NICKEL_INGOT::get)
.viaCooking(() -> TFMGItems.RAW_NICKEL)
.inFurnace(),
LITHIUM_LEAD = create(TFMGItems.LITHIUM_INGOT::get)
LITHIUM = create(TFMGItems.LITHIUM_INGOT::get)
.viaCooking(() -> TFMGItems.RAW_LITHIUM)
.inFurnace(),
RAW_LEAD_BLASTING = create(TFMGItems.LEAD_INGOT::get).withSuffix("_blasting")
.viaCooking(() -> TFMGItems.RAW_LEAD)
.inBlastFurnace(),
NICKEL_LEAD_BLASTING = create(TFMGItems.NICKEL_INGOT::get).withSuffix("_blasting")
.viaCooking(() -> TFMGItems.RAW_NICKEL)
.inBlastFurnace(),
LITHIUM_BLASTING = create(TFMGItems.LITHIUM_INGOT::get).withSuffix("_blasting")
.viaCooking(() -> TFMGItems.RAW_LITHIUM)
.inBlastFurnace(),
//
LEAD_FROM_CRUSHED_BLASTING = create(TFMGItems.LEAD_INGOT::get).withSuffix("_from_crushed_blasting")
.viaCooking(() -> AllItems.CRUSHED_LEAD)
.inBlastFurnace(),
NICKEL_FROM_CRUSHED_BLASTING = create(TFMGItems.NICKEL_INGOT::get).withSuffix("_from_crushed_blasting")
.viaCooking(() -> AllItems.CRUSHED_NICKEL)
.inBlastFurnace(),
//
THERMITE_GRENADE = create(TFMGItems.THERMITE_GRENADE)
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
@@ -1760,7 +1791,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("SPN")
.pattern("WIW")),
BLAST_STOVE = create(TFMGBlocks.BLAST_STOVE)
BLAST_STOVE = create(TFMGBlocks.BLAST_STOVE).returns(2)
.unlockedBy(TFMGItems.FIREPROOF_BRICK::get)
.viaShaped(b -> b
.define('F', fireproofBricks())

2
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java
View File

@@ -30,7 +30,7 @@ public class TFMGCompactingRecipeGen extends TFMGPressingRecipeGen {
CAST_IRON = create("cast_iron", b -> b
.require(ironIngot())
.require(coal())
.output(TFMGItems.CAST_IRON_INGOT, 2)
.output(TFMGItems.CAST_IRON_INGOT, 1)
.requiresHeat(HeatCondition.HEATED)
);

28
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java
View File

@@ -5,6 +5,8 @@ import com.drmangotea.tfmg.registry.TFMGBlocks;
import com.drmangotea.tfmg.registry.TFMGFluids;
import com.simibubi.create.AllRecipeTypes;
import net.minecraft.data.PackOutput;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.Items;
import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*;
@@ -14,6 +16,7 @@ public class TFMGFillingRecipeGen extends TFMGProcessingRecipeGen {
GeneratedRecipe
HARDENED_PLANKS = create("hardened_planks", b -> b
.require(ItemTags.PLANKS)
.require(TFMGFluids.CREOSOTE.getSource(), 250)
.output(TFMGBlocks.HARDENED_PLANKS)),
@@ -21,46 +24,55 @@ public class TFMGFillingRecipeGen extends TFMGProcessingRecipeGen {
//GAS TANKS
LPG_TANK = create("lpg_tank", b -> b
.require(Items.BUCKET)
.require(lpg(), 1000)
.output(lpgTank())
),
BUTANE_TANK = create("butane_tank", b -> b
.require(butane(), 1000)
.output(butaneTank())
),
PROPANE_TANK = create("propane_tank", b -> b
.require(propane(), 1000)
.output(propaneTank())
),
//BUTANE_TANK = create("butane_tank", b -> b
// .require(butane(), 1000)
// .output(butaneTank())
//),
//PROPANE_TANK = create("propane_tank", b -> b
// .require(propane(), 1000)
// .output(propaneTank())
//),
HYDROGEN_TANK = create("hydrogen_tank", b -> b
.require(Items.BUCKET)
.require(hydrogen(), 1000)
.output(hydrogenTank())
),
FURNACE_GAS_TANK = create("furnace_gas_tank", b -> b
.require(Items.BUCKET)
.require(blastFurnaceGas(), 1000)
.output(furnaceGasTank())
),
ETHYLENE_TANK = create("ethylene_tank", b -> b
.require(Items.BUCKET)
.require(ethylene(), 1000)
.output(ethyleneTank())
),
PROPYLENE_TANK = create("propylene_tank", b -> b
.require(Items.BUCKET)
.require(propylene(), 1000)
.output(propyleneTank())
),
NEON_TANK = create("neon_tank", b -> b
.require(Items.BUCKET)
.require(neon(), 1000)
.output(neonTank())
),
CARBON_DIOXIDE_TANK = create("carbon_dioxide_tank", b -> b
.require(Items.BUCKET)
.require(carbonDioxide(), 1000)
.output(carbonDioxideTank())
),
AIR_TANK = create("air_tank", b -> b
.require(Items.BUCKET)
.require(air(), 1000)
.output(airTank())
),
HOT_AIR_TANK = create("hot_air_tank", b -> b
.require(Items.BUCKET)
.require(hotAir(), 1000)
.output(hotAirTank())
);

2
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java
View File

@@ -61,7 +61,7 @@ public class TFMGSequencedAssemblyRecipeGen extends CreateRecipeProvider {
),
HEAVY_PLATE = create("heavy_plate", b -> b.require(TFMGItems.HEAVY_PLATE)
HEAVY_PLATE = create("heavy_plate", b -> b.require(steelIngot())
.transitionTo(TFMGItems.UNPROCESSED_HEAVY_PLATE.get())
.addOutput(TFMGItems.HEAVY_PLATE.get(), 1)
.loops(1)

4
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/CastingRecipeGen.java
View File

@@ -13,12 +13,12 @@ public class CastingRecipeGen extends TFMGProcessingRecipeGen {
STEEL_INGOT = create("steel", b ->b
.require(TFMGFluids.MOLTEN_STEEL.get(),144)
.output(TFMGItems.STEEL_INGOT)
.duration(60)),
.duration(200)),
SILICON = create("silicon", b ->b
.require(TFMGFluids.LIQUID_SILICON.get(),144)
.output(TFMGItems.SILICON_INGOT)
.duration(60));
.duration(200));
;
public CastingRecipeGen(PackOutput output) {
super(output);

4
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/IndustrialBlastingRecipeGen.java
View File

@@ -28,7 +28,7 @@ public class IndustrialBlastingRecipeGen extends TFMGRecipeProvider{
.require(TFMGTags.TFMGItemTags.FLUX.tag)
.output(TFMGFluids.MOLTEN_STEEL.get(),144)
.output(TFMGFluids.MOLTEN_SLAG.get(),144)
.output(TFMGFluids.FURNACE_GAS.get(),20)
.output(TFMGFluids.FURNACE_GAS.get(),200)
.duration(20)
, 20),
STEEL_DOUBLE = createIndustrialBlastingRecipe("steel_from_raw_iron", b -> (IndustrialBlastingRecipeBuilder) b
@@ -36,7 +36,7 @@ public class IndustrialBlastingRecipeGen extends TFMGRecipeProvider{
.require(Ingredient.of(TFMGTags.TFMGItemTags.FLUX.tag))
.output(TFMGFluids.MOLTEN_STEEL.get(),288)
.output(TFMGFluids.MOLTEN_SLAG.get(),288)
.output(TFMGFluids.FURNACE_GAS.get(),20)
.output(TFMGFluids.FURNACE_GAS.get(),200)
.duration(40)
, 30),

2
src/main/java/com/drmangotea/tfmg/mixin/RecipeProviderMixin.java
View File

@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
public class RecipeProviderMixin {
@Inject(at = @At("HEAD"), method = "getName",cancellable = true , remap = false)
@Inject(at = @At("HEAD"), method = "getName",cancellable = true , remap = true)
public final void getName(CallbackInfoReturnable<String> cir) {
if((Object)this instanceof TFMGMechanicalCraftingRecipeGen)
cir.setReturnValue("TFMG'S Mechanical Crafting Recipes");

29
src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java
View File

@@ -169,23 +169,24 @@ public class TFMGBlocks {
}
//------------------ENGINES------------------//
public static final BlockEntry<TurbineEngineBlock> TURBINE_ENGINE = REGISTRATE.block("turbine_engine", TurbineEngineBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.addLayer(() -> RenderType::cutoutMipped)
.transform(TFMGStress.setCapacity(85))
.blockstate(new TurbineEngineGenerator()::generate)
.item()
.transform(customItemModel())
.register();
public static final BlockEntry<RegularEngineBlock> REGULAR_ENGINE = REGISTRATE.block("regular_engine", RegularEngineBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.onRegister(connectedTextures(() -> new EngineCTBehavior(TFMGSpriteShifts.REGULAR_ENGINE_TOP, TFMGSpriteShifts.REGULAR_ENGINE_BOTTOM, TFMGSpriteShifts.REGULAR_ENGINE_SIDE)))
.blockstate(new EngineGenerator()::generate)
.transform(TFMGStress.setCapacity(45.0))
.item()
.transform(customItemModel())
.register();
public static final BlockEntry<TurbineEngineBlock> TURBINE_ENGINE = REGISTRATE.block("turbine_engine", TurbineEngineBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.addLayer(() -> RenderType::cutoutMipped)
.transform(TFMGStress.setCapacity(45.0))
.blockstate(new TurbineEngineGenerator()::generate)
.transform(TFMGStress.setCapacity(85.0))
.item()
.transform(customItemModel())
.register();
@@ -193,7 +194,7 @@ public class TFMGBlocks {
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(TFMGStress.setCapacity(45.0))
.transform(TFMGStress.setCapacity(85))
.onRegister(connectedTextures(() -> new EngineCTBehavior(TFMGSpriteShifts.REGULAR_ENGINE_TOP, TFMGSpriteShifts.REGULAR_ENGINE_BOTTOM, TFMGSpriteShifts.REGULAR_ENGINE_SIDE)))
.blockstate(new TurbineEngineGenerator()::generate)
.item()
@@ -203,7 +204,7 @@ public class TFMGBlocks {
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(TFMGStress.setCapacity(45.0))
.transform(TFMGStress.setCapacity(55))
.blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.partialBaseModel(c, p)))
.item()
.transform(customItemModel())
@@ -212,7 +213,7 @@ public class TFMGBlocks {
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(TFMGStress.setCapacity(30))
.transform(TFMGStress.setCapacity(40))
.blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.partialBaseModel(c, p)))
.item()
.transform(customItemModel())

3
src/main/resources/assets/tfmg/lang/default/interface.json
View File

@@ -21,6 +21,8 @@
"create.goggles.blast_furnace.fuel_amount": " Fuel : %1$s",
"create.goggles.blast_furnace.height": " Height: %1$s",
"create.goggles.blast_furnace.reinforced": "Reinforced",
"create.goggles.blast_furnace.timer": "Time Left: %1$s",
"create.goggles.blast_furnace.modifier": "Production Time: %1$s",
"create.goggles.blast_stove.header": "Blast Stove: ",
"create.goggles.blast_stove.tank1": "Input Tank 1: ",
@@ -122,6 +124,7 @@
"create.recipe.coking": "Coking",
"create.recipe.polarizing": "Polarizing",
"create.recipe.chemical_vat": "Chemical Vat",
"create.recipe.hot_blast": "Air Blasting",
"tfmg.keyinfo.custom_button": "Engine Controller Custom Button",
"tfmg.keyinfo.engine_start": "Start Engine",

0
src/main/resources/assets/tfmg/textures/block/surface_scanner_flags/flag1.png
View File

1
src/main/resources/tfmg.mixins.json
View File

@@ -9,7 +9,6 @@
"FluidPropagatorMixin",
"GoggleOverlayRendererMixin",
"PipeAttachmentModelMixin",
"RecipeProviderMixin",
"FluidTankBlockEntityMixin",
"accessor.FluidTankBlockEntityAccessor",
"accessor.TankSegmentAccessor"