0.9.0c

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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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'
 

shapes/cable_connector.java

@@ -0,0 +1 @@
+Block.box(6, 0, 6, 10, 9, 10)

shapes/cable_connector_middle.java

@@ -0,0 +1 @@
+Block.box(6, 0, 6, 10, 16, 10)

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)

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)

shapes/light_bulb.java

@@ -0,0 +1 @@
+Block.box(5, 0, 5, 11, 9, 11)

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)

shapes/rotor.java

@@ -0,0 +1 @@
+Block.box(3, 3, 2, 13, 13, 14)

shapes/voltmeter.java

@@ -0,0 +1 @@
+Block.box(0, 2, 13, 16, 14, 16)

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
+// 1.19.2	2024-07-04T21:35:03.7066189	Create: The Factory Must Grow's lang merger
-33a8f334cb21003d00d77f8789288b83dd2bbb60 assets/createindustry/lang/en_us.json
+667bd974985484dace99ea6a538d4b4bf26283f8 assets/createindustry/lang/en_us.json

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",

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)
+                        if (!(be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).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()
-                        ) {
 
-                           // 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);
+
+                                }
+                            }
+
                 }
 
             }

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)
+                        if (!(be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).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()
+
-                        ) {
+
+
+                            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;
                         }
-
                     }
+
                 }
 
             }

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<IElectricBlock> machines = new ArrayList<>();
+
+
+    public ElectricalNetwork(IElectricBlock startBE){
+        machines.add(startBE);
+    }
+
+
+
+}

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;
+
+}

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"
 

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:",