Recycling Recipes by serenibyss · Pull Request #292 · GregTechCEu/GregTech

serenibyss · 2021-12-05T06:44:56Z

No description provided.

serenibyss · 2021-12-05T06:51:00Z

+
+    private static void splitStacks(List<Tuple<ItemStack, MaterialStack>> list, ItemStack originalStack, UnificationEntry entry) {
+        int amount = originalStack.getCount();
+        while (amount > 64) {


This could cause problems, but since we are pretty much only using a permutation of a Dust or Ingot, the stack size should be consistently 64

serenibyss · 2021-12-05T06:52:00Z

+        }
+
+        // Else if the Material has NO_SMELTING, return nothing
+        if (material.hasFlag(NO_SMELTING)) {


This prevents things like Brick Dust and Stone Dust from being output in the process

serenibyss · 2021-12-05T06:53:07Z

-    public static void init() {
-        initializeArcRecyclingRecipes();
-    }
+    // TODO - Fix recipe order with some things (noticed Hermetic Casings)


This should be addressed, but there might be an edge case still. Loading order is important for some recipes now, as if a later recipe uses an input (say, Steam Oven using Bronze Casings), unification data could be wrong

I have not noticed issues with the Hermetic Casings when I check

serenibyss · 2021-12-05T06:53:16Z

-        initializeArcRecyclingRecipes();
-    }
+    // TODO - Fix recipe order with some things (noticed Hermetic Casings)
+    // TODO - Figure out solution to LuV+ components


Discussed, and will be in a later PR

serenibyss · 2021-12-05T06:53:46Z

+    // TODO - Fix recipe order with some things (noticed Hermetic Casings)
+    // TODO - Figure out solution to LuV+ components
+    // TODO - (to remember) Do NOT calculate any material component lists for circuits, they are simply totally lost
+    // TODO - Work on durations and EUt's


The durations are resolved, though EU/t's may be too high for some recipes

serenibyss · 2021-12-05T06:55:20Z

+        OreDictUnifier.registerOre(MetaTileEntities.HULL[0].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.WroughtIron, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.Lead, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+
+        OreDictUnifier.registerOre(MetaTileEntities.HULL[1].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.Steel, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.Tin, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+
+        OreDictUnifier.registerOre(MetaTileEntities.HULL[2].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.Aluminium, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.Copper, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+
+        OreDictUnifier.registerOre(MetaTileEntities.HULL[3].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.StainlessSteel, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.Gold, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+
+        OreDictUnifier.registerOre(MetaTileEntities.HULL[4].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.Titanium, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.Aluminium, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+
+        OreDictUnifier.registerOre(MetaTileEntities.HULL[5].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.TungstenSteel, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.Tungsten, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+
+        OreDictUnifier.registerOre(MetaTileEntities.HULL[6].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.RhodiumPlatedPalladium, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.VanadiumGallium, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+
+        OreDictUnifier.registerOre(MetaTileEntities.HULL[7].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.NaquadahAlloy, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.Naquadah, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+
+        OreDictUnifier.registerOre(MetaTileEntities.HULL[8].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.Livermorium, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.NaquadahAlloy, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+
+        OreDictUnifier.registerOre(MetaTileEntities.HULL[14].getStackForm(), new ItemMaterialInfo(
+                new MaterialStack(Materials.Neutronium, OrePrefix.plate.materialAmount * 8),
+                new MaterialStack(Materials.RutheniumTriniumAmericiumNeutronate, OrePrefix.cableGtSingle.materialAmount * 2),
+                new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2)));
+


These had to be done separately since the handcrafting recipe is more resource-expensive than the Assembler recipe, leading to potential dupes. If we add a method onto RecipeBuilder to calculate unification data, these can be removed (as can the entries for EBF coils)

Minor nitpick that should not really matter. These should use the proper assembler fluid materials, instead of all just using rubber. Edit: Never mind this comment. But also, the MAX hull should not have the rubber component, because it uses superconductor wires

serenibyss · 2021-12-05T06:56:36Z

+     * Returns an Ingot of the material if it exists. Otherwise it returns a Dust.
+     * Returns ItemStack.EMPTY if neither exist.
+     */
+    public static ItemStack getIngotOrDust(Material material, long materialAmount) {


Needed to not return an ItemStack.EMPTY for some Arc Furnace recipes (Ash, in particular)

ALongStringOfNumbers

Magnetic Materials Arc smelt into their non-magnetic form, but macerate into the magnetic dust. Is this intended?

ALongStringOfNumbers · 2021-12-11T20:15:38Z

+    public static ItemStack getIngotOrDust(MaterialStack materialStack) {
+        return getIngotOrDust(materialStack.material, materialStack.amount);
+    }


Why did you add this method, when anything that can call this method can automatically call the method's redirect, as it has access to the materialStack.amount and materialStack.material already. This seems like a useless method

ALongStringOfNumbers

Other than my minor comments, this looks good to me

serenibyss commented Dec 5, 2021

View reviewed changes

Comment thread src/main/java/gregtech/api/unification/ore/OrePrefix.java Outdated

ALongStringOfNumbers reviewed Dec 6, 2021

View reviewed changes

Comment thread src/main/java/gregtech/api/recipes/ModHandler.java Outdated

Comment thread src/main/java/gregtech/api/recipes/ModHandler.java

Comment thread src/main/java/gregtech/api/recipes/ModHandler.java

Comment thread src/main/java/gregtech/api/recipes/ModHandler.java

ALongStringOfNumbers reviewed Dec 8, 2021

View reviewed changes

mstrandboge and others added 10 commits December 10, 2021 20:50

refactor ItemMaterialInfo

e8af071

start work on arc furnace recycling

8e4b9c5

finish up logic in ModHandler

e2d1801

rewrite RecyclingRecipes

5772700

redo duration calculation, other fixes

75d71a0

lots more work on recycling recipe logic

8403747

fix many missing FLAMMABLE flags

084676c

fix misc recycling issues

fb4cb37

fix a couple mistakes

01462f2

address some requested changes

b69e6f6

serenibyss force-pushed the recycling-recipes branch from 53a2061 to b69e6f6 Compare December 11, 2021 03:00

serenibyss added 2 commits December 10, 2021 21:01

fix merge issues

a741bff

reorganize registerRecyclingRecipes slightly

2cfd910

kumquat-ir reviewed Dec 11, 2021

View reviewed changes

Comment thread src/main/java/gregtech/loaders/recipe/RecyclingRecipes.java Outdated

fix recipe EU/t's

9f7c02d

ALongStringOfNumbers reviewed Dec 11, 2021

View reviewed changes

ALongStringOfNumbers approved these changes Dec 11, 2021

View reviewed changes

serenibyss merged commit 65e2223 into master Dec 11, 2021

serenibyss deleted the recycling-recipes branch December 11, 2021 20:24

Conversation

serenibyss commented Dec 5, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ALongStringOfNumbers Dec 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ALongStringOfNumbers left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ALongStringOfNumbers left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ALongStringOfNumbers Dec 11, 2021 •

edited

Loading