fixed roaster recipe, added recipes to make uu matter and scrap

GregTech-Intergalactical · Aug 1, 2023 · 725ef87 · 725ef87
1 parent fec1efe
commit 725ef87
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 3 deletions.
diff --git a/common/src/main/java/muramasa/gregtech/GregTech.java b/common/src/main/java/muramasa/gregtech/GregTech.java
@@ -136,6 +136,7 @@ public static void registerRecipeLoaders(IAntimatterRegistrar registrar, IRecipe
         loader.accept("electromagnetic_separating", ElectromagneticSeparatorLoader::init);
         loader.accept("polarizing", PolarizerLoader::init);
         loader.accept("decaying", DecayChamber::init);
+        loader.accept("uu_matter", UUMatter::init);
         loader.accept("large_boiler", LargeBoilerLoader::init);
         loader.accept("roaster", RoastingLoader::init);
         //loader.accept("dehydrating", ChemicalDehydrator::init);

diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechData.java b/common/src/main/java/muramasa/gregtech/data/GregTechData.java
@@ -81,6 +81,7 @@ public static void init(Side side) {
     public static ItemBasic<?> CoalBall = new ItemBasic<>(GTIRef.ID, "coal_ball");
     public static ItemBasic<?> CompressedCoalBall = new ItemBasic<>(GTIRef.ID, "compressed_coal_ball");
     public static ItemBasic<?> CoalChunk = new ItemBasic<>(GTIRef.ID, "coal_chunk");
+    public static ItemBasic<?> Scrap = new ItemBasic<>(GTIRef.ID, "scrap");
 
     public static ItemBasic<?> ItemFilter = new ItemBasic<>(GTIRef.ID, "item_filter");
     public static ItemBasic<?> DiamondSawBlade = new ItemBasic<>(GTIRef.ID, "diamond_saw_blade");

diff --git a/common/src/main/java/muramasa/gregtech/data/Guis.java b/common/src/main/java/muramasa/gregtech/data/Guis.java
@@ -102,7 +102,7 @@ public static void init(Side side) {
                 .add(EV, IT_OUT, 125, 34);
         ROASTER.add(IT_IN, 53, 25).add(IT_OUT, 107, 16).add(IT_OUT, 125, 16).add(IT_OUT, 107, 34)
                 .add(IT_OUT, 125, 34).add(FL_IN, 53, 63).add(FL_OUT, 107, 63);
-        RECYCLER.add(COMPRESSOR);
+        RECYCLER.add(COMPRESSOR).add(FL_IN, 53, 63);
         SCANNER.add(COMPRESSOR);
         WIRE_MILL.add(COMPRESSOR);
         CENTRIFUGE.add(IT_IN, 35, 25)

diff --git a/common/src/main/java/muramasa/gregtech/data/Machines.java b/common/src/main/java/muramasa/gregtech/data/Machines.java
@@ -94,7 +94,7 @@ public class Machines {
     public static BasicMachine POLARIZER = new BasicMachine(GTIRef.ID, "polarizer").setMap(POLARIZING).addFlags(GUI, ITEM);
     public static BasicMachine PLASMA_ARC_FURNACE = new BasicMachine(GTIRef.ID, "plasma_arc_furnace").setMap(PLASMA_ARC_SMELTING).addFlags(GUI, ITEM, FLUID).amps(3);
     public static BasicMachine ROASTER = new BasicMachine(GTIRef.ID, "roaster").setMap(ROASTING).addFlags(GUI, ITEM, FLUID).amps(3);
-    public static BasicMachine RECYCLER = new BasicMachine(GTIRef.ID, "recycler").setMap(RECYCLING).addFlags(GUI, ITEM);
+    public static BasicMachine RECYCLER = new BasicMachine(GTIRef.ID, "recycler").setMap(RECYCLING).addFlags(GUI, ITEM, FLUID);
     public static BasicMachine REPLICATOR = new BasicMachine(GTIRef.ID, "replicator").setMap(REPLICATING).addFlags(GUI, ITEM, FLUID);
     public static BasicMachine SCANNER = new BasicMachine(GTIRef.ID, "scanner").setMap(SCANNING).addFlags(GUI, ITEM, FLUID).setSound(GregTechSounds.MAGNETIZER,  0.6f);
     public static BasicMachine SIFTER = new BasicMachine(GTIRef.ID, "sifter").setMap(SIFTING).addFlags(GUI, ITEM);

diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/RoastingLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/RoastingLoader.java
@@ -18,7 +18,7 @@ public static void init(){
         RecipeMaps.ROASTING.RB().fi(Oxygen.getGas(5000)).ii(DUST.getMaterialIngredient(Stibnite, 1)).io(DUST_SMALL.get(Antimony)).fo(SulfurDioxide.getGas(1000)).add("stibnite", 512, 5, 0, 3);
         RecipeMaps.ROASTING.RB().fi(Oxygen.getGas(4000)).ii(DUST.getMaterialIngredient(Sphalerite, 1)).io(DUST_SMALL.get(Zinc, 2)).fo(SulfurDioxide.getGas(1000)).add("sphalerite", 512, 5, 0, 3);
         RecipeMaps.ROASTING.RB().fi(Oxygen.getGas(3000)).ii(DUST.getMaterialIngredient(Cobaltite, 1)).io(DUST_SMALL.get(Cobalt), DUST_SMALL.get(Arsenic)).fo(SulfurDioxide.getGas(1000)).add("cobaltite", 512, 5, 0, 3);
-        RecipeMaps.ROASTING.RB().fi(Oxygen.getGas(8000)).ii(DUST.getMaterialIngredient(Sulfur, 1)).io(DUST_TINY.get(Sulfur)).fo(SulfurDioxide.getGas(3000)).add("pyrite", 512, 5, 0, 3);
+        RecipeMaps.ROASTING.RB().fi(Oxygen.getGas(8000)).ii(DUST.getMaterialIngredient(Sulfur, 1)).io(DUST_TINY.get(Sulfur)).fo(SulfurDioxide.getGas(3000)).add("sulfur", 512, 5, 0, 3);
 
 
 

diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/UUMatter.java b/common/src/main/java/muramasa/gregtech/loader/machines/UUMatter.java
@@ -0,0 +1,40 @@
+package muramasa.gregtech.loader.machines;
+
+import muramasa.antimatter.AntimatterAPI;
+import muramasa.antimatter.Ref;
+import muramasa.antimatter.data.AntimatterMaterialTypes;
+import muramasa.antimatter.material.Material;
+import muramasa.antimatter.material.MaterialTypeFluid;
+import muramasa.antimatter.material.MaterialTypeItem;
+import muramasa.antimatter.recipe.ingredient.RecipeIngredient;
+import muramasa.gregtech.data.GregTechData;
+import muramasa.gregtech.data.Materials;
+import muramasa.gregtech.data.RecipeMaps;
+import tesseract.TesseractGraphWrappers;
+
+import static muramasa.antimatter.data.AntimatterMaterialTypes.BLOCK;
+import static muramasa.antimatter.material.MaterialTags.MOLTEN;
+import static muramasa.gregtech.data.Materials.UUAmplifier;
+import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS;
+
+public class UUMatter {
+    public static void init(){
+        RecipeMaps.MASS_FABRICATING.RB().fi(UUAmplifier.getLiquid(1)).fo(Materials.UUMatter.getLiquid(1)).add("uu_matter", 803, 256);
+        RecipeMaps.MASS_FABRICATING.RB().ii(INT_CIRCUITS.get(0)).fo(Materials.UUMatter.getLiquid(1)).add("uu_matter_expensive", 3215, 256);
+        RecipeMaps.AMP_FABRICATING.RB().ii(RecipeIngredient.of(GregTechData.Scrap, 9)).fo(UUAmplifier.getLiquid(1)).add("uu_amplifier", 180, 32);
+        AntimatterAPI.all(Material.class).stream().filter(m -> m.getElement() != null).forEach(m -> {
+            int multiplier = m == Materials.Silicon || m == Materials.Oxygen ? 1 : 2;
+            m.getTypes().forEach(t -> {
+                if (t instanceof MaterialTypeFluid<?> fluid && fluid.get() instanceof MaterialTypeFluid.IFluidGetter fluidGetter){
+                    long fluidAmount = m.has(MOLTEN) ? Ref.L : 1000 * TesseractGraphWrappers.dropletMultiplier;
+                    RecipeMaps.RECYCLING.RB().fi(fluidGetter.get(m, fluidAmount)).io(GregTechData.Scrap).chances(500 * multiplier).add("scrap_from_" + m.getId() + "_" + t.getId(), 100, 2);
+                } else if (t == BLOCK){
+                    RecipeMaps.RECYCLING.RB().ii(BLOCK.getMaterialIngredient(m, 1)).io(GregTechData.Scrap).chances(4500 * multiplier).add("scrap_from_" + m.getId() + "_block", 100, 2);
+                } else if (t instanceof MaterialTypeItem<?> item){
+                    long chance = (500 * t.getUnitValue()) / Ref.U;
+                    RecipeMaps.RECYCLING.RB().ii(t.getMaterialIngredient(m, 1)).io(GregTechData.Scrap).chances(Math.min(10000, (int)chance) * multiplier).add("scrap_from_" + m.getId() + "_" + t.getId(), 100, 2);
+                }
+            });
+        });
+    }
+}