Update build.gradle.

MartinSVK12 · MartinSVK12 · commit 2f8455e9d570 · 2025-01-22T17:16:17.000+01:00
Update electric energy example.
Small improvements to item handling.
diff --git a/energy-electric-example/build.gradle b/energy-electric-example/build.gradle
@@ -18,7 +18,6 @@ dependencies {
 		implementation project(path: ':catalyst', configuration: "namedElements")
 		implementation project(path: ':catalyst:energy', configuration: "namedElements")
 		implementation project(path: ":btwaila",configuration: "namedElements")
-		implementation project(path: ":guilib",configuration: "namedElements")
 	} else {
 		implementation project(path: ':', configuration: "namedElements")
 		implementation project(path: ':energy', configuration: "namedElements")
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/CatalystEnergyExample.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/CatalystEnergyExample.java
@@ -4,16 +4,13 @@
 import net.minecraft.client.render.block.color.BlockColorDispatcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sunsetsatellite.catalyst.core.util.MpGuiEntry;
 import sunsetsatellite.catalyst.core.util.tile.TEFeature;
 import sunsetsatellite.catalyst.core.util.tile.feature.ItemContainerFeature;
 import sunsetsatellite.catalyst.energy.electric.example.block.color.BlockColorWire;
-import sunsetsatellite.catalyst.energy.electric.example.container.ContainerSimpleElectricBatteryBox;
 import sunsetsatellite.catalyst.energy.electric.example.data.ElectricBlocks;
 import sunsetsatellite.catalyst.energy.electric.example.data.ElectricConfig;
 import sunsetsatellite.catalyst.energy.electric.example.data.ElectricItems;
 import sunsetsatellite.catalyst.energy.electric.example.data.WireMaterials;
-import sunsetsatellite.catalyst.energy.electric.example.gui.GuiSimpleElectricBatteryBox;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntityCable;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntitySimpleElectricBatteryBox;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntitySimpleElectricGenerator;
@@ -56,7 +53,7 @@ public void onInitialize() {
 		EntityHelper.createTileEntity(TileEntitySimpleElectricMachine.class,"ElSimpleMachine");
 		EntityHelper.createTileEntity(TileEntityCable.class,"ElCable");
 
-		Catalyst.GUIS.register("ElBatteryBox",new MpGuiEntry(TileEntitySimpleElectricBatteryBox.class, GuiSimpleElectricBatteryBox.class, ContainerSimpleElectricBatteryBox.class));
+		//Catalyst.GUIS.register("ElBatteryBox",new MpGuiEntry(TileEntitySimpleElectricBatteryBox.class, GuiSimpleElectricBatteryBox.class, ContainerSimpleElectricBatteryBox.class));
 
         LOGGER.info("Example mod for Catalyst's electric energy system initialized.");
     }
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/api/impl/btwaila/tooltip/ElectricTooltip.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/api/impl/btwaila/tooltip/ElectricTooltip.java
@@ -3,9 +3,9 @@
 import net.minecraft.client.render.stitcher.TextureRegistry;
 import net.minecraft.core.net.command.TextFormatting;
 import sunsetsatellite.catalyst.core.util.NumberUtil;
-import sunsetsatellite.catalyst.energy.improved.electric.base.TileEntityElectricBase;
-import sunsetsatellite.catalyst.energy.improved.electric.base.TileEntityElectricGenerator;
-import sunsetsatellite.catalyst.energy.improved.electric.base.TileEntityElectricStorage;
+import sunsetsatellite.catalyst.energy.electric.base.TileEntityElectricBase;
+import sunsetsatellite.catalyst.energy.electric.base.TileEntityElectricGenerator;
+import sunsetsatellite.catalyst.energy.electric.base.TileEntityElectricStorage;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntitySimpleElectricBatteryBox;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntitySimpleElectricGenerator;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntitySimpleElectricMachine;
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/api/impl/btwaila/tooltip/ElectricWireTooltip.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/api/impl/btwaila/tooltip/ElectricWireTooltip.java
@@ -1,7 +1,7 @@
 package sunsetsatellite.catalyst.energy.electric.example.api.impl.btwaila.tooltip;
 
 import net.minecraft.client.render.stitcher.TextureRegistry;
-import sunsetsatellite.catalyst.energy.improved.electric.base.TileEntityElectricConductor;
+import sunsetsatellite.catalyst.energy.electric.base.TileEntityElectricConductor;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntityCable;
 import toufoumaster.btwaila.gui.components.AdvancedInfoComponent;
 import toufoumaster.btwaila.tooltips.TileTooltip;
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockCable.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockCable.java
@@ -14,9 +14,9 @@
 import sunsetsatellite.catalyst.core.util.ISideInteractable;
 import sunsetsatellite.catalyst.core.util.network.NetworkComponent;
 import sunsetsatellite.catalyst.core.util.network.NetworkType;
-import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
-import sunsetsatellite.catalyst.energy.improved.electric.api.WireMaterial;
-import sunsetsatellite.catalyst.energy.improved.electric.api.WireProperties;
+import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
+import sunsetsatellite.catalyst.energy.electric.api.WireMaterial;
+import sunsetsatellite.catalyst.energy.electric.api.WireProperties;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntityCable;
 
 
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockElectric.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockElectric.java
@@ -13,9 +13,9 @@
 import sunsetsatellite.catalyst.core.util.ICustomDescription;
 import sunsetsatellite.catalyst.core.util.network.NetworkComponent;
 import sunsetsatellite.catalyst.core.util.network.NetworkType;
-import sunsetsatellite.catalyst.energy.improved.electric.api.IVoltageTiered;
-import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
-import sunsetsatellite.catalyst.energy.improved.electric.base.TileEntityElectricBase;
+import sunsetsatellite.catalyst.energy.electric.api.IVoltageTiered;
+import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
+import sunsetsatellite.catalyst.energy.electric.base.TileEntityElectricBase;
 
 import java.util.Random;
 
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockElectricBatteryBox.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockElectricBatteryBox.java
@@ -8,7 +8,7 @@
 import net.minecraft.core.world.World;
 import sunsetsatellite.catalyst.Catalyst;
 import sunsetsatellite.catalyst.core.util.NumberUtil;
-import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
+import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntitySimpleElectricBatteryBox;
 
 public class BlockElectricBatteryBox extends BlockElectric {
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockElectricGenerator.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockElectricGenerator.java
@@ -3,7 +3,7 @@
 import net.minecraft.core.block.entity.TileEntity;
 import net.minecraft.core.item.ItemStack;
 import net.minecraft.core.net.command.TextFormatting;
-import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
+import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntitySimpleElectricGenerator;
 
 public class BlockElectricGenerator extends BlockElectric {
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockElectricMachine.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/block/BlockElectricMachine.java
@@ -3,7 +3,7 @@
 import net.minecraft.core.block.entity.TileEntity;
 import net.minecraft.core.item.ItemStack;
 import net.minecraft.core.net.command.TextFormatting;
-import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
+import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
 import sunsetsatellite.catalyst.energy.electric.example.tile.TileEntitySimpleElectricMachine;
 
 public class BlockElectricMachine extends BlockElectric{
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/container/ContainerSimpleElectricBatteryBox.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/container/ContainerSimpleElectricBatteryBox.java
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/data/ElectricBlocks.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/data/ElectricBlocks.java
@@ -2,8 +2,8 @@
 
 import sunsetsatellite.catalyst.core.util.DataInitializer;
 import sunsetsatellite.catalyst.core.util.Direction;
-import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
-import sunsetsatellite.catalyst.energy.improved.electric.api.WireProperties;
+import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
+import sunsetsatellite.catalyst.energy.electric.api.WireProperties;
 import sunsetsatellite.catalyst.energy.electric.example.block.BlockCable;
 import sunsetsatellite.catalyst.energy.electric.example.block.BlockElectricBatteryBox;
 import sunsetsatellite.catalyst.energy.electric.example.block.BlockElectricGenerator;
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/data/ElectricItems.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/data/ElectricItems.java
@@ -3,7 +3,7 @@
 import sunsetsatellite.catalyst.core.util.DataInitializer;
 import sunsetsatellite.catalyst.energy.electric.example.item.ItemBattery;
 import sunsetsatellite.catalyst.energy.electric.example.item.model.ItemModelBattery;
-import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
+import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
 import turniplabs.halplibe.helper.ItemBuilder;
 
 import static sunsetsatellite.catalyst.CatalystEnergy.LOGGER;
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/data/WireMaterials.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/data/WireMaterials.java
@@ -2,8 +2,8 @@
 
 import sunsetsatellite.catalyst.CatalystEnergy;
 import sunsetsatellite.catalyst.core.util.DataInitializer;
-import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
-import sunsetsatellite.catalyst.energy.improved.electric.api.WireMaterial;
+import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
+import sunsetsatellite.catalyst.energy.electric.api.WireMaterial;
 
 public class WireMaterials extends DataInitializer {
 
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/gui/GuiSimpleElectricBatteryBox.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/gui/GuiSimpleElectricBatteryBox.java
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/item/ItemBattery.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/item/ItemBattery.java
@@ -5,9 +5,9 @@
 import net.minecraft.core.net.command.TextFormatting;
 import sunsetsatellite.catalyst.core.util.ICustomDescription;
 import sunsetsatellite.catalyst.core.util.NumberUtil;
-import sunsetsatellite.catalyst.energy.improved.electric.api.IElectricItem;
-import sunsetsatellite.catalyst.energy.improved.electric.api.IVoltageTiered;
-import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
+import sunsetsatellite.catalyst.energy.electric.api.IElectricItem;
+import sunsetsatellite.catalyst.energy.electric.api.IVoltageTiered;
+import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
 
 public class ItemBattery extends Item implements IElectricItem, ICustomDescription, IVoltageTiered {
 
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/tile/TileEntityCable.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/tile/TileEntityCable.java
@@ -1,7 +1,7 @@
 package sunsetsatellite.catalyst.energy.electric.example.tile;
 
 import net.minecraft.core.block.Block;
-import sunsetsatellite.catalyst.energy.improved.electric.base.TileEntityElectricConductor;
+import sunsetsatellite.catalyst.energy.electric.base.TileEntityElectricConductor;
 import sunsetsatellite.catalyst.energy.electric.example.block.BlockCable;
 
 public class TileEntityCable extends TileEntityElectricConductor {
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/tile/TileEntitySimpleElectricBatteryBox.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/tile/TileEntitySimpleElectricBatteryBox.java
@@ -11,7 +11,7 @@
 import sunsetsatellite.catalyst.core.util.Direction;
 import sunsetsatellite.catalyst.core.util.tile.feature.ItemContainerFeature;
 import sunsetsatellite.catalyst.energy.electric.example.item.ItemBattery;
-import sunsetsatellite.catalyst.energy.improved.electric.base.TileEntityElectricStorage;
+import sunsetsatellite.catalyst.energy.electric.base.TileEntityElectricStorage;
 import sunsetsatellite.catalyst.energy.electric.example.block.BlockElectric;
 
 import java.util.Random;
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/tile/TileEntitySimpleElectricGenerator.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/tile/TileEntitySimpleElectricGenerator.java
@@ -1,7 +1,7 @@
 package sunsetsatellite.catalyst.energy.electric.example.tile;
 
 import net.minecraft.core.block.Block;
-import sunsetsatellite.catalyst.energy.improved.electric.base.TileEntityElectricGenerator;
+import sunsetsatellite.catalyst.energy.electric.base.TileEntityElectricGenerator;
 import sunsetsatellite.catalyst.energy.electric.example.block.BlockElectric;
 
 public class TileEntitySimpleElectricGenerator extends TileEntityElectricGenerator {
diff --git a/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/tile/TileEntitySimpleElectricMachine.java b/energy-electric-example/src/main/java/sunsetsatellite/catalyst/energy/electric/example/tile/TileEntitySimpleElectricMachine.java
@@ -1,7 +1,7 @@
 package sunsetsatellite.catalyst.energy.electric.example.tile;
 
 import net.minecraft.core.block.Block;
-import sunsetsatellite.catalyst.energy.improved.electric.base.TileEntityElectricDevice;
+import sunsetsatellite.catalyst.energy.electric.base.TileEntityElectricDevice;
 import sunsetsatellite.catalyst.energy.electric.example.block.BlockElectric;
 
 public class TileEntitySimpleElectricMachine extends TileEntityElectricDevice{
diff --git a/energy/src/main/java/sunsetsatellite/catalyst/energy/electric/api/VoltageTier.java b/energy/src/main/java/sunsetsatellite/catalyst/energy/electric/api/VoltageTier.java
@@ -32,6 +32,9 @@ public static VoltageTier get(int voltage){
 				return tier;
 			}
 		}
+		if(voltage >= MAX.maxVoltage){
+			return MAX;
+		}
 		return null;
 	}
 }
diff --git a/settings.gradle b/settings.gradle
@@ -24,3 +24,8 @@ include 'multiblocks'
 include 'effects'
 include 'multipart'
 include 'all'
+
+include(":btwaila")
+project(":btwaila").projectDir = file("${rootProject.projectDir}/../BTWaila")
+include(":tmb")
+project(":tmb").projectDir = file("${rootProject.projectDir}/../../Foreign/TMB")
diff --git a/src/main/java/sunsetsatellite/catalyst/core/util/InventoryWrapper.java b/src/main/java/sunsetsatellite/catalyst/core/util/InventoryWrapper.java
@@ -295,7 +295,7 @@ public int find(int id, int meta, CompoundTag data) {
         List<ItemStack> stacks = Catalyst.collectStacks(connected);
         for (int i = 0; i < stacks.size(); i++) {
             if(stacks.get(i) == null) continue;
-            if(stacks.get(i).itemID == id && stacks.get(i).getMetadata() == meta) {
+            if(stacks.get(i).itemID == id && (stacks.get(i).getMetadata() == meta || meta == -1)) {
                 if(stacks.get(i).getData().equals(data) || data == null) {
                     return i;
                 }
diff --git a/src/main/java/sunsetsatellite/catalyst/core/util/ItemStackList.java b/src/main/java/sunsetsatellite/catalyst/core/util/ItemStackList.java
@@ -364,7 +364,7 @@ public ArrayList<ItemStack> returnMissing(ArrayList<ItemStack> stacks) {
     @Override
     public long count(int id, int meta, CompoundTag data) {
         return contents.stream().mapToInt((S) -> {
-            if (S.itemID == id && S.getMetadata() == meta) {
+            if (S.itemID == id && (S.getMetadata() == meta || meta == -1)) {
                 return S.stackSize;
             }
             return 0;
@@ -381,16 +381,16 @@ public long count(int id) {
         }).sum();
     }
 
-    @Override
-    public int find(int id, int meta, CompoundTag data) {
-        for (int i = 0; i < contents.size(); i++) {
-            ItemStack content = contents.get(i);
-            if (content.getMetadata() == meta && content.itemID == id) {
-                return i;
-            }
-        }
-        return -1;
-    }
+	@Override
+	public int find(int id, int meta, CompoundTag data) {
+		for (int i = 0; i < contents.size(); i++) {
+			ItemStack content = contents.get(i);
+			if ((content.getMetadata() == meta || meta == -1) && content.itemID == id) {
+				return i;
+			}
+		}
+		return -1;
+	}
 
     @Override
     public ItemStack get(int index) {

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ public static VoltageTier get(int voltage){`
`32`	`32`	`return tier;`
`33`	`33`	`}`
`34`	`34`	`}`
	`35`	`+ if(voltage >= MAX.maxVoltage){`
	`36`	`+ return MAX;`
	`37`	`+ }`
`35`	`38`	`return null;`
`36`	`39`	`}`
`37`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public int find(int id, int meta, CompoundTag data) {`
`295`	`295`	`List<ItemStack> stacks = Catalyst.collectStacks(connected);`
`296`	`296`	`for (int i = 0; i < stacks.size(); i++) {`
`297`	`297`	`if(stacks.get(i) == null) continue;`
`298`		`- if(stacks.get(i).itemID == id && stacks.get(i).getMetadata() == meta) {`
	`298`	`+ if(stacks.get(i).itemID == id && (stacks.get(i).getMetadata() == meta \|\| meta == -1)) {`
`299`	`299`	`if(stacks.get(i).getData().equals(data) \|\| data == null) {`
`300`	`300`	`return i;`
`301`	`301`	`}`