diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 00000000..997925c3 --- /dev/null +++ b/TODO.txt @@ -0,0 +1,35 @@ +0.9.1 + +aluminum tanks +portable generator +smokestacks +firebox produce co2 +coke ovens co2 +generator upgrade +oil can +cooling fluid bottle +invert redstone control +electric heater +fuel pump +asphalt mixture +new cable connectors +proper electric network +engine efficiency rework + + + + + + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle index 785f2da8..2578bfa8 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ apply plugin: 'org.spongepowered.mixin' // add sourceSets.main, "createindustry.refmap.json" //} -version = '0.9.0b-1.19.2' +version = '0.9.0c-1.19.2' group = 'com.drmangotea.createindustry' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'createindustry' diff --git a/shapes/cable_connector.java b/shapes/cable_connector.java new file mode 100644 index 00000000..ca47e98e --- /dev/null +++ b/shapes/cable_connector.java @@ -0,0 +1 @@ +Block.box(6, 0, 6, 10, 9, 10) \ No newline at end of file diff --git a/shapes/cable_connector_middle.java b/shapes/cable_connector_middle.java new file mode 100644 index 00000000..c7435e2d --- /dev/null +++ b/shapes/cable_connector_middle.java @@ -0,0 +1 @@ +Block.box(6, 0, 6, 10, 16, 10) \ No newline at end of file diff --git a/shapes/galvanic_cell.java b/shapes/galvanic_cell.java new file mode 100644 index 00000000..ca15ce68 --- /dev/null +++ b/shapes/galvanic_cell.java @@ -0,0 +1 @@ +Shapes.join(Block.box(1, 0, 5, 15, 10, 11), Block.box(5, 0, 0, 11, 11, 5), BooleanOp.OR) \ No newline at end of file diff --git a/shapes/generator.java b/shapes/generator.java new file mode 100644 index 00000000..cacb7cef --- /dev/null +++ b/shapes/generator.java @@ -0,0 +1 @@ +Shapes.join(Block.box(3, 0, 3, 13, 14, 13), Block.box(0, 5, 0, 16, 11, 16), BooleanOp.OR) \ No newline at end of file diff --git a/shapes/light_bulb.java b/shapes/light_bulb.java new file mode 100644 index 00000000..3231d8c2 --- /dev/null +++ b/shapes/light_bulb.java @@ -0,0 +1 @@ +Block.box(5, 0, 5, 11, 9, 11) \ No newline at end of file diff --git a/shapes/resistor.java b/shapes/resistor.java new file mode 100644 index 00000000..aa5e0675 --- /dev/null +++ b/shapes/resistor.java @@ -0,0 +1 @@ +Shapes.join(Block.box(1, 0, 1, 15, 3, 15), Block.box(3, 3, 0, 13, 13, 16), BooleanOp.OR) \ No newline at end of file diff --git a/shapes/rotor.java b/shapes/rotor.java new file mode 100644 index 00000000..18641efb --- /dev/null +++ b/shapes/rotor.java @@ -0,0 +1 @@ +Block.box(3, 3, 2, 13, 13, 14) \ No newline at end of file diff --git a/shapes/voltmeter.java b/shapes/voltmeter.java new file mode 100644 index 00000000..7a5d7f18 --- /dev/null +++ b/shapes/voltmeter.java @@ -0,0 +1 @@ +Block.box(0, 2, 13, 16, 14, 16) \ No newline at end of file diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index e9c15bd9..9ea862ff 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2024-07-03T15:07:29.6924992 Create: The Factory Must Grow's lang merger -33a8f334cb21003d00d77f8789288b83dd2bbb60 assets/createindustry/lang/en_us.json +// 1.19.2 2024-07-04T21:35:03.7066189 Create: The Factory Must Grow's lang merger +667bd974985484dace99ea6a538d4b4bf26283f8 assets/createindustry/lang/en_us.json diff --git a/src/generated/resources/assets/createindustry/lang/en_us.json b/src/generated/resources/assets/createindustry/lang/en_us.json index c4136ac3..700adcb8 100644 --- a/src/generated/resources/assets/createindustry/lang/en_us.json +++ b/src/generated/resources/assets/createindustry/lang/en_us.json @@ -840,7 +840,7 @@ "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.goggles.electricity.no_power": "No Power", + "create.goggles.electric_machine.no_power": "No Power", "create.goggles.electricity.insufficient_voltage": "Insufficient Voltage", "create.goggles.voltmeter": "Voltmeter:", "create.goggles.voltmeter.voltage": " Measured Voltage: %1$s V", diff --git a/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/IElectricBlock.java b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/IElectricBlock.java index 274ae9c6..2f9061b6 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/IElectricBlock.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/IElectricBlock.java @@ -142,21 +142,25 @@ public interface IElectricBlock { }else + if(be1!=null) { - if (be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).isPresent() && getForgeEnergy().getEnergyStored() > 0) { + if (be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).isPresent()) { - if (!(be1.getCapability(ForgeCapabilities.ENERGY).orElse(new EnergyStorage(0)) instanceof TFMGForgeEnergyStorage) - && be1.getCapability(ForgeCapabilities.ENERGY).orElse(new EnergyStorage(0)).getEnergyStored() > 0 && - be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).orElse(new EnergyStorage(0)).canReceive() - ) { + if (!(be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).orElse(new EnergyStorage(0)) instanceof TFMGForgeEnergyStorage)) { - // lowestDistance = 0; - // setDistanceFromSource(1); - // getsVoltageFromNonTFMGBlock = true; - } - } + + + int i = be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).orElse(new EnergyStorage(0)).receiveEnergy(1000, true); + int y = getForgeEnergy().extractEnergy(1000, true); + + int j = be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).orElse(new EnergyStorage(0)).receiveEnergy(Math.min(y,i), false); + getForgeEnergy().extractEnergy(j, false); + + } + } + } } diff --git a/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/CableConnectorBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/CableConnectorBlockEntity.java index 145ed725..fc041317 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/CableConnectorBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/CableConnectorBlockEntity.java @@ -226,19 +226,22 @@ public class CableConnectorBlockEntity extends ElectricBlockEntity { }else if(be1!=null) { - if (be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).isPresent() && getForgeEnergy().getEnergyStored() > 0) { + if (be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).isPresent()) { - if (!(be1.getCapability(ForgeCapabilities.ENERGY).orElse(new EnergyStorage(0)) instanceof TFMGForgeEnergyStorage) - && be1.getCapability(ForgeCapabilities.ENERGY).orElse(new EnergyStorage(0)).getEnergyStored() > 0 && - be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).orElse(new EnergyStorage(0)).canReceive() - ) { + if (!(be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).orElse(new EnergyStorage(0)) instanceof TFMGForgeEnergyStorage)) { + + + + + int i = be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).orElse(new EnergyStorage(0)).receiveEnergy(1000, true); + int y = getForgeEnergy().extractEnergy(1000, true); + + int j = be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).orElse(new EnergyStorage(0)).receiveEnergy(Math.min(y,i), false); + getForgeEnergy().extractEnergy(j, false); - // lowestDistance = 0; - // setDistanceFromSource(1); - // getsVoltageFromNonTFMGBlock = true; } - } + } } diff --git a/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/test/ElectricalNetwork.java b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/test/ElectricalNetwork.java new file mode 100644 index 00000000..6a527ddb --- /dev/null +++ b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/test/ElectricalNetwork.java @@ -0,0 +1,18 @@ +package com.drmangotea.createindustry.blocks.electricity.base.cables.test; + +import com.drmangotea.createindustry.blocks.electricity.base.IElectricBlock; + +import java.util.ArrayList; + +public class ElectricalNetwork { + + public ArrayList machines = new ArrayList<>(); + + + public ElectricalNetwork(IElectricBlock startBE){ + machines.add(startBE); + } + + + +} diff --git a/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/test/ElectricalNetworkMember.java b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/test/ElectricalNetworkMember.java new file mode 100644 index 00000000..66895b2f --- /dev/null +++ b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/test/ElectricalNetworkMember.java @@ -0,0 +1,11 @@ +package com.drmangotea.createindustry.blocks.electricity.base.cables.test; + +import com.drmangotea.createindustry.blocks.electricity.base.TFMGForgeEnergyStorage; + +public class ElectricalNetworkMember { + + public int voltage; + + public TFMGForgeEnergyStorage energy; + +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 70461505..aac2ef0c 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -8,7 +8,7 @@ license="MIT" modId="createindustry" -version="0.9.0b" +version="0.9.0c" displayName="Create: The Factory Must Grow" diff --git a/src/main/resources/assets/createindustry/lang/default/interface.json b/src/main/resources/assets/createindustry/lang/default/interface.json index 0694cac4..05fe224c 100644 --- a/src/main/resources/assets/createindustry/lang/default/interface.json +++ b/src/main/resources/assets/createindustry/lang/default/interface.json @@ -67,7 +67,7 @@ "create.goggles.machine_input.no_rot": "No Rotation Provided!", "create.goggles.machine_input.power_level": "Power Level: ", - "create.goggles.electricity.no_power": "No Power", + "create.goggles.electric_machine.no_power": "No Power", "create.goggles.electricity.insufficient_voltage": "Insufficient Voltage", "create.goggles.voltmeter": "Voltmeter:",