Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions src/main/java/supersymmetry/common/materials/SusyMaterials.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package supersymmetry.common.materials;

import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.Map;

import gregtech.api.GregTechAPI;
import gregtech.api.fluids.FluidBuilder;
import gregtech.api.fluids.store.FluidStorageKeys;
Expand All @@ -14,8 +10,10 @@
import gregtech.api.unification.material.properties.*;
import supersymmetry.api.SusyLog;
import supersymmetry.api.unification.material.info.SuSyMaterialFlags;
import supersymmetry.api.unification.material.properties.MillBallProperty;
import supersymmetry.api.unification.material.properties.SuSyPropertyKey;

import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.Map;

public class SusyMaterials {

Expand Down Expand Up @@ -202,9 +200,6 @@ private static void changeProperties() {
Materials.Electrum.setProperty(PropertyKey.ORE, new OreProperty());

Materials.Hydrogen.addFlags(MaterialFlags.FLAMMABLE);

// Debug only
Materials.Steel.setProperty(SuSyPropertyKey.MILL_BALL, new MillBallProperty(23123));
}

private static void removeProperty(PropertyKey<?> key, Material material) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
package supersymmetry.loaders.recipes;

import static gregtech.api.GTValues.*;
import static gregtech.api.recipes.RecipeMaps.*;
import static gregtech.api.unification.material.Materials.*;
import static gregtech.api.unification.ore.OrePrefix.*;

import java.util.*;

import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;

import org.jetbrains.annotations.NotNull;

import gregtech.api.GTValues;
import gregtech.api.recipes.ModHandler;
import gregtech.api.recipes.Recipe;
Expand All @@ -32,13 +19,25 @@
import gregtech.common.items.MetaItems;
import gregtech.common.items.ToolItems;
import gregtech.loaders.recipe.handlers.RecyclingRecipeHandler;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import org.jetbrains.annotations.NotNull;
import supersymmetry.api.recipes.SuSyRecipeMaps;
import supersymmetry.api.unification.material.info.SuSyMaterialFlags;
import supersymmetry.api.unification.material.properties.FiberProperty;
import supersymmetry.api.unification.material.properties.MillBallProperty;
import supersymmetry.api.unification.material.properties.SuSyPropertyKey;
import supersymmetry.api.unification.ore.SusyOrePrefix;
import supersymmetry.common.item.SuSyMetaItems;

import java.util.*;

import static gregtech.api.GTValues.*;
import static gregtech.api.recipes.RecipeMaps.*;
import static gregtech.api.unification.material.Materials.*;
import static gregtech.api.unification.ore.OrePrefix.*;

public class SuSyMaterialRecipeHandler {

// For SUSY molds to be put into
Expand All @@ -62,6 +61,8 @@ public static void init() {
SuSyMaterialRecipeHandler::processHIPPressing);
addProcessingHandler(PropertyKey.DUST, OrePrefix.dust, SuSyMaterialFlags.CONTINUOUSLY_CAST,
SuSyMaterialRecipeHandler::processContinuouslyCast);
SusyOrePrefix.millBall.addProcessingHandler(SuSyPropertyKey.MILL_BALL,
SuSyMaterialRecipeHandler::processMillBall);
}

public static <T extends IMaterialProperty> void addProcessingHandler(PropertyKey<T> propertyKey, OrePrefix prefix,
Expand Down Expand Up @@ -363,4 +364,14 @@ public static void processSheetedFrame(OrePrefix sheetedFramePrefix, Material ma
* }
*/
}

public static void processMillBall(OrePrefix millBallPrefix, Material mat, MillBallProperty property) {
FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
.notConsumable(MetaItems.SHAPE_MOLD_BALL)
.fluidInputs(mat.getFluid(144))
.output(SusyOrePrefix.millBall, mat, 1)
.EUt(VA[LV])
.duration(200)
.buildAndRegister();
}
}
Loading