From 250a74a513bce89c2d489e2d40ac4ee843bb726f Mon Sep 17 00:00:00 2001
From: trinsdar <30245301+Trinsdar@users.noreply.github.com>
Date: Thu, 1 Aug 2024 21:25:50 -0400
Subject: [PATCH] added progress sensor

---
 .../cover/redstone/CoverProgressSensor.java   |  49 ++++++++++++++++++
 .../gregtech/data/GregTechCovers.java         |   4 ++
 .../gregtech/data/GregTechMaterialEvents.java |   2 +-
 .../gregtech/loader/crafting/Parts.java       |   4 +-
 .../textures/block/cover/progress_sensor.png  | Bin 0 -> 303 bytes
 .../textures/item/basic/progress_sensor.png   | Bin 0 -> 4434 bytes
 6 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 common/src/main/java/muramasa/gregtech/cover/redstone/CoverProgressSensor.java
 create mode 100644 common/src/main/resources/assets/gti/textures/block/cover/progress_sensor.png
 create mode 100644 common/src/main/resources/assets/gti/textures/item/basic/progress_sensor.png

diff --git a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverProgressSensor.java b/common/src/main/java/muramasa/gregtech/cover/redstone/CoverProgressSensor.java
new file mode 100644
index 000000000..74351f6c8
--- /dev/null
+++ b/common/src/main/java/muramasa/gregtech/cover/redstone/CoverProgressSensor.java
@@ -0,0 +1,49 @@
+package muramasa.gregtech.cover.redstone;
+
+import earth.terrarium.botarium.common.fluid.base.FluidContainer;
+import earth.terrarium.botarium.common.fluid.base.FluidHolder;
+import muramasa.antimatter.blockentity.BlockEntityMachine;
+import muramasa.antimatter.blockentity.pipe.BlockEntityFluidPipe;
+import muramasa.antimatter.capability.ICoverHandler;
+import muramasa.antimatter.capability.machine.MachineRecipeHandler;
+import muramasa.antimatter.cover.CoverFactory;
+import muramasa.antimatter.machine.Tier;
+import muramasa.gregtech.cover.base.CoverBasicRedstoneOutput;
+import net.minecraft.core.Direction;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.stream.IntStream;
+
+public class CoverProgressSensor extends CoverBasicRedstoneOutput {
+    public CoverProgressSensor(@NotNull ICoverHandler<?> source, @Nullable Tier tier, Direction side, CoverFactory factory) {
+        super(source, tier, side, factory);
+    }
+
+    @Override
+    public boolean canPlace() {
+        return handler.getTile() instanceof BlockEntityMachine<?> machine && machine.recipeHandler.side(side).isPresent();
+    }
+
+    @Override
+    public ResourceLocation getModel(String type, Direction dir) {
+        if (type.equals("pipe")) return PIPE_COVER_MODEL;
+        return getBasicModel();
+    }
+
+    @Override
+    public void onUpdate() {
+        if (handler.getTile().getLevel() == null || handler.getTile().getLevel().isClientSide) return;
+        MachineRecipeHandler<?> recipeHandler = handler.getTile() instanceof BlockEntityMachine<?> machine ? machine.recipeHandler.side(side).orElse(null) : null;
+        if (recipeHandler != null){
+            long scale = recipeHandler.getMaxProgress() > 0 ? recipeHandler.getMaxProgress() / 15L : 0;
+            long currentProgress = recipeHandler.getCurrentProgress();
+            if (scale > 0){
+                setOutputRedstone(inverted ? (int) (15L - currentProgress / scale) : (int) (currentProgress / scale));
+            } else {
+                setOutputRedstone(inverted ? 15 : 0);
+            }
+        }
+    }
+}
diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechCovers.java b/common/src/main/java/muramasa/gregtech/data/GregTechCovers.java
index c529b4e64..2a6c4f849 100644
--- a/common/src/main/java/muramasa/gregtech/data/GregTechCovers.java
+++ b/common/src/main/java/muramasa/gregtech/data/GregTechCovers.java
@@ -10,6 +10,7 @@
 import muramasa.gregtech.GTIRef;
 import muramasa.gregtech.cover.*;
 import muramasa.gregtech.cover.redstone.CoverNeedsMaintenance;
+import muramasa.gregtech.cover.redstone.CoverProgressSensor;
 import muramasa.gregtech.cover.redstone.CoverRedstoneMachineController;
 import muramasa.gregtech.items.ItemCoverCustomTooltip;
 import net.minecraft.nbt.CompoundTag;
@@ -83,6 +84,9 @@ public class GregTechCovers {
     public static final CoverFactory COVER_NEEDS_MAINTENANCE_COVER = CoverFactory.builder(CoverNeedsMaintenance::new).item((a, b) -> {
         return new ItemCover(GTIRef.ID, "needs_maintenance_cover");
     }).addTextures(new Texture(GTIRef.ID, "block/cover/needs_maintenance_cover")).build(GTIRef.ID, "needs_maintenance_cover");
+    public static final CoverFactory COVER_PROGRESS_SENSOR = CoverFactory.builder(CoverProgressSensor::new).item((a, b) -> {
+        return new ItemCover(GTIRef.ID, "progress_sensor");
+    }).addTextures(new Texture(GTIRef.ID, "block/cover/progress_sensor")).build(GTIRef.ID, "progress_sensor");
     public static final CoverFactory COVER_ENERGY_DETECTOR = CoverFactory.builder(CoverEnergyDetector::new).item((a, b) -> {
         return new ItemCover(GTIRef.ID, "energy_detector");
     }).addTextures(new Texture(GTIRef.ID, "block/cover/energy_detector")).build(GTIRef.ID, "energy_detector");
diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java
index 6b756109e..b58aa81e2 100644
--- a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java
+++ b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java
@@ -134,7 +134,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
         event.setMaterial(BlackBronze).asMetal(2000, FRAME);
         event.setMaterial(BlackSteel).asMetal(1200, 1200, FRAME, PLATE).forceBF(false);
         event.setMaterial(BlueSteel).asMetal(1400, 1400, FRAME).forceBF(false);
-        event.setMaterial(Brass).asMetal(1170, FRAME, ROD_LONG, PLATE);
+        event.setMaterial(Brass).asMetal(1170, FRAME, ROD_LONG, PLATE, GEAR_SMALL);
         event.setMaterial(Bronze).asMetal(1125, GEAR, FRAME, ROTOR);
         event.setMaterial(CdInAGAlloy).asMetal(752, ROD);
         event.setMaterial(CobaltBrass).asMetal(1500, GEAR);
diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java b/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
index dc6e49e8b..08aa4e0c5 100644
--- a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
+++ b/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
@@ -32,8 +32,7 @@
 
 import static com.google.common.collect.ImmutableMap.of;
 import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.CIRCUITS_ADVANCED;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.PLATES_IRON_ALUMINIUM;
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.data.AntimatterDefaultTools.*;
@@ -91,6 +90,7 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
       provider.shapeless(output, GTIRef.ID, "data_stick_clearing", "data_sticks", new ItemStack(GregTechItems.DataStick), GregTechItems.DataStick);
       provider.shapeless(output, GTIRef.ID, "fluid_filter_reset", "filters", GregTechCovers.COVER_FLUID_FILTER.getItem(), GregTechCovers.COVER_FLUID_FILTER.getItem().getItem());
       provider.shapeless(output, GTIRef.ID, "item_filter_reset", "filters", GregTechCovers.COVER_ITEM_FILTER.getItem(), GregTechCovers.COVER_ITEM_FILTER.getItem().getItem());
+      provider.addItemRecipe(output, "covers", GregTechCovers.COVER_PROGRESS_SENSOR.getItem().getItem(), of('W', CABLE_GETTER.apply(PipeSize.VTINY, LV, false), 'A', PLATE.getMaterialTag(Aluminium), 'G', GEAR_SMALL.getMaterialTag(Brass), 'C', CIRCUITS_GOOD), "WAW", "GCG");
       provider.addItemRecipe(output, "misc", DiamondGrindHead, of('D', DUST.getMaterialTag(Diamond), 'G', GEM.getMaterialTag(Diamond), 'S', PLATE.getMaterialTag(Steel)), "DSD", "SGS", "DSD");
       provider.addItemRecipe(output, "misc", TungstenGrindHead, of('D', PLATE.getMaterialTag(Tungsten), 'G', GEM.getMaterialTag(Diamond), 'S', PLATE.getMaterialTag(Steel)), "DSD", "SGS", "DSD");
       provider.addItemRecipe(output, "hazmat", UniversalHazardSuitMask, of('L', PLATE.getMaterialTag(Lead), 'A', PLATE.getMaterialTag(Aluminium), 'C', Items.CHAINMAIL_HELMET, 'G', Items.GLASS_PANE), "ALA", "LCL", "AGA");
diff --git a/common/src/main/resources/assets/gti/textures/block/cover/progress_sensor.png b/common/src/main/resources/assets/gti/textures/block/cover/progress_sensor.png
new file mode 100644
index 0000000000000000000000000000000000000000..72e8b2d9b762073bc243647171498cdbc30062e2
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0pdfpR
zr>`sf11@HMWefSFzV$#Mwj^(N7l!{JxM1({$v}}ko-U3d7QM+kD*tmb@2q&(X3LXs
zY@u_zgxHz*0|C*|rwf!PFzPt+<jvd1lXReom0LnW;-B%6V@CwmN*--!YpZIzu_J;_
zT3Wg-n=xev!!k}6VWtRP2eBoy7+;)|?PLp(={TVAx4+l-0)xOg5C8x2qM~2#U%&o+
ze{=KUdS&Is|5vSA^}kR}CB<<<ZYO6a&^I%V9CYyWduQ*_ry=g*=JxOV$B+N=)6>7-
szi{Eh{;sZ5^@fIqZ}b`rPaI|7`?hYwDqAIapg$NqUHx3vIVCg!0LFH5DF6Tf

literal 0
HcmV?d00001

diff --git a/common/src/main/resources/assets/gti/textures/item/basic/progress_sensor.png b/common/src/main/resources/assets/gti/textures/item/basic/progress_sensor.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f5da33f498280d07abd6e9fde518ffcd57007bd
GIT binary patch
literal 4434
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

literal 0
HcmV?d00001