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

Merge remote-tracking branch 'origin/1.21.1' into 1.21.1

Browse Source
This commit is contained in:
DrMangoTea
2025-07-26 22:35:24 +02:00
parent 5d31947f7d edce5d7e0e
commit bd0c1c255b
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlockEntity.java
View File

@@ -175,28 +175,32 @@ public class WindingMachineBlockEntity extends KineticBlockEntity implements IHa
}
public void performRecipe() {
//Change these if you want. Just fallbacks if the component is null.
int defaultResistance = 0;
int defaultSpoolAmount = 0;
int defaultCoilTurns = 0;
if (getSpeed() == 0)
return;
if (inventory.getItem(0).is(TFMGItems.ELECTROMAGNETIC_COIL.get()) && spool.is(TFMGItems.COPPER_SPOOL.get()) && spool.get(TFMGDataComponents.SPOOL_AMOUNT) > 0 && inventory.getItem(0).get(TFMGDataComponents.COIL_TURNS) < turnPercentage.getValue() * 10) {
if(inventory.getItem(0).get(TFMGDataComponents.COIL_TURNS)< turnPercentage.getValue()*10){
spool.set(TFMGDataComponents.SPOOL_AMOUNT, spool.get(TFMGDataComponents.SPOOL_AMOUNT) - 1);
inventory.getItem(0).set(TFMGDataComponents.COIL_TURNS, inventory.getItem(0).get(TFMGDataComponents.COIL_TURNS) + 1);
if (inventory.getItem(0).is(TFMGItems.ELECTROMAGNETIC_COIL.get()) && spool.is(TFMGItems.COPPER_SPOOL.get()) && spool.getOrDefault(TFMGDataComponents.SPOOL_AMOUNT, defaultSpoolAmount) > 0 && inventory.getItem(0).getOrDefault(TFMGDataComponents.COIL_TURNS, defaultCoilTurns) < turnPercentage.getValue() * 10) {
if(inventory.getItem(0).getOrDefault(TFMGDataComponents.COIL_TURNS, defaultCoilTurns) < turnPercentage.getValue() * 10){
spool.set(TFMGDataComponents.SPOOL_AMOUNT, spool.getOrDefault(TFMGDataComponents.SPOOL_AMOUNT, defaultSpoolAmount) - 1);
inventory.getItem(0).set(TFMGDataComponents.COIL_TURNS, inventory.getItem(0).getOrDefault(TFMGDataComponents.COIL_TURNS, defaultCoilTurns) + 1);
return;
}
}
if(spool.get(TFMGDataComponents.SPOOL_AMOUNT)!=null)
if (inventory.getItem(0).is(TFMGBlocks.RESISTOR.asItem()) && spool.is(TFMGItems.CONSTANTAN_SPOOL.get()) && spool.get(TFMGDataComponents.SPOOL_AMOUNT) > 0 && inventory.getItem(0).get(TFMGDataComponents.RESISTANCE) < turnPercentage.getValue() * 10) {
if(inventory.getItem(0).get(TFMGDataComponents.RESISTANCE)< turnPercentage.getValue()*10) {
spool.set(TFMGDataComponents.SPOOL_AMOUNT, spool.get(TFMGDataComponents.SPOOL_AMOUNT) - 1);
inventory.getItem(0).set(TFMGDataComponents.RESISTANCE, inventory.getItem(0).get(TFMGDataComponents.RESISTANCE) + 1);
return;
if(spool.has(TFMGDataComponents.SPOOL_AMOUNT))
if (inventory.getItem(0).is(TFMGBlocks.RESISTOR.asItem()) && spool.is(TFMGItems.CONSTANTAN_SPOOL.get()) && spool.getOrDefault(TFMGDataComponents.SPOOL_AMOUNT, defaultSpoolAmount) > 0 && inventory.getItem(0).getOrDefault(TFMGDataComponents.RESISTANCE, defaultResistance) < turnPercentage.getValue() * 10) {
if(inventory.getItem(0).getOrDefault(TFMGDataComponents.RESISTANCE, 0)< turnPercentage.getValue() * 10) {
spool.set(TFMGDataComponents.SPOOL_AMOUNT, spool.getOrDefault(TFMGDataComponents.SPOOL_AMOUNT, defaultSpoolAmount) - 1);
inventory.getItem(0).set(TFMGDataComponents.RESISTANCE, inventory.getItem(0).getOrDefault(TFMGDataComponents.RESISTANCE, defaultResistance) + 1);
return;
}
}
}
if(spool.get(TFMGDataComponents.SPOOL_AMOUNT)!=null)
if (spool.get(TFMGDataComponents.SPOOL_AMOUNT) == 0 && !spool.is(TFMGItems.EMPTY_SPOOL.get()) && spool.getItem() instanceof SpoolItem)
spool = TFMGItems.EMPTY_SPOOL.asStack();
if(spool.has(TFMGDataComponents.SPOOL_AMOUNT))
if (spool.getOrDefault(TFMGDataComponents.SPOOL_AMOUNT, defaultSpoolAmount) == 0 && !spool.is(TFMGItems.EMPTY_SPOOL.get()) && spool.getItem() instanceof SpoolItem)
spool = TFMGItems.EMPTY_SPOOL.asStack();
if (recipe == null) {
return;