Anvilcraft/ModTweaker
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

made temp in K, improved recipe matching and IIngredient handling

Browse source
This commit is contained in:
Riernar 2019-07-04 11:23:33 +02:00
parent 76b437f067
commit 5fa01baea8
3 changed files with 144 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/main/java/com/blamejared/compat/mantle/RecipeMatchIIngredient.java Normal file
View file

@ -0,0 +1,57 @@
package com.blamejared.compat.mantle;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import com.google.common.collect.Lists;
import crafttweaker.api.item.IIngredient;
import crafttweaker.api.minecraft.CraftTweakerMC;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import slimeknights.mantle.util.RecipeMatch;
public class RecipeMatchIIngredient extends RecipeMatch {
private IIngredient ingredient;
private List<ItemStack> items;
public RecipeMatchIIngredient(IIngredient ingredient) {
this(ingredient, 1);
}
public RecipeMatchIIngredient(IIngredient ingredient, int amountMatched) {
super(amountMatched, ingredient.getAmount());
this.ingredient = ingredient;
}
@Override
public List<ItemStack> getInputs() {
if(items != null) {
return items;
}
return items = Arrays.stream(ingredient.getItemArray()).map(CraftTweakerMC::getItemStack).collect(Collectors.toList());
}
@Override
public Optional<Match> matches(NonNullList<ItemStack> stacks) {
List<ItemStack> found = Lists.newLinkedList();
int stillNeeded = amountNeeded;
for(ItemStack stack : stacks) {
if(ingredient.matches(CraftTweakerMC.getIItemStack(stack))) {
// add the amount found to the list
ItemStack copy = stack.copy();
copy.setCount(Math.min(copy.getCount(), stillNeeded));
found.add(copy);
stillNeeded -= copy.getCount();
// we found enough
if(stillNeeded <= 0) {
return Optional.of(new Match(found, amountMatched));
}
}
}
return Optional.empty();
}
}

113
src/main/java/com/blamejared/compat/tcomplement/highoven/HighOven.java
View file

@ -1,11 +1,14 @@
package com.blamejared.compat.tcomplement.highoven;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.blamejared.ModTweaker;
import com.blamejared.compat.mantle.RecipeMatchIIngredient;
import com.blamejared.compat.tcomplement.highoven.recipes.HeatRecipeTweaker;
import com.blamejared.compat.tcomplement.highoven.recipes.HighOvenFuelTweaker;
import com.blamejared.compat.tcomplement.highoven.recipes.MixRecipeTweaker;
@ -16,16 +19,14 @@ import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
import crafttweaker.api.item.IIngredient;
import crafttweaker.api.item.IItemStack;
import crafttweaker.api.liquid.ILiquidStack;
import crafttweaker.api.oredict.IOreDictEntry;
import knightminer.tcomplement.library.TCompRegistry;
import knightminer.tcomplement.library.events.TCompRegisterEvent;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import slimeknights.mantle.util.RecipeMatch;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@ -36,8 +37,8 @@ import stanhebben.zenscript.annotations.ZenMethod;
public class HighOven {
public static final List<IItemStack> REMOVED_FUELS = new LinkedList<>();
public static final Map<ILiquidStack, ILiquidStack> REMOVED_HEAT_RECIPES = new LinkedHashMap<>();
public static final List<ILiquidStack> REMOVED_MIX_RECIPES = new LinkedList<>();
public static final Map<FluidStack, Set<FluidStack>> REMOVED_HEAT_RECIPES = new LinkedHashMap<>();
public static final Map<FluidStack, Set<FluidStack>> REMOVED_MIX_RECIPES = new LinkedHashMap<>();
private static boolean init = false;
@ -55,45 +56,26 @@ public class HighOven {
}
@ZenMethod
public static void addFuel(IItemStack fuel, int burnTime, int tempRate) {
public static void addFuel(IIngredient fuel, int burnTime, int tempRate) {
init();
ModTweaker.LATE_ADDITIONS.add(new HighOven.AddFuel(InputHelper.toStack(fuel), burnTime, tempRate));
}
@ZenMethod
public static void addFuel(IOreDictEntry fuel, int burnTime, int tempRate) {
init();
ModTweaker.LATE_ADDITIONS.add(new HighOven.AddFuel(fuel.getName(), burnTime, tempRate));
ModTweaker.LATE_ADDITIONS.add(new HighOven.AddFuel(fuel, burnTime, tempRate));
}
private static class AddFuel extends BaseAction {
private ItemStack itemFuel;
private String oreFuel;
private IIngredient fuel;
private int time;
private int rate;
public AddFuel(ItemStack fuel, int time, int rate) {
public AddFuel(IIngredient fuel, int time, int rate) {
super("HighOven.Fuel");
this.itemFuel = fuel;
this.oreFuel = null;
this.time = time;
this.rate = rate;
}
public AddFuel(String fuel, int time, int rate) {
super("HighOven.Fuel");
this.itemFuel = null;
this.oreFuel = fuel;
this.fuel = fuel;
this.time = time;
this.rate = rate;
}
@Override
public void apply() {
if (itemFuel != null)
TCompRegistry.registerFuel(new HighOvenFuelTweaker(RecipeMatch.of(itemFuel), time, rate));
if (oreFuel != null)
TCompRegistry.registerFuel(new HighOvenFuelTweaker(RecipeMatch.of(oreFuel), time, rate));
TCompRegistry.registerFuel(new HighOvenFuelTweaker(new RecipeMatchIIngredient(fuel), time, rate));
}
@Override
@ -103,10 +85,7 @@ public class HighOven {
@Override
public String getRecipeInfo() {
if (itemFuel != null)
return itemFuel.getItem().getUnlocalizedName();
else
return oreFuel;
return LogHelper.getStackDescription(fuel);
}
}
@ -145,7 +124,7 @@ public class HighOven {
public static void addHeatRecipe(ILiquidStack output, ILiquidStack input, int temp) {
init();
ModTweaker.LATE_ADDITIONS
.add(new HighOven.AddHeat(InputHelper.toFluid(output), InputHelper.toFluid(input), temp + 300));
.add(new HighOven.AddHeat(InputHelper.toFluid(output), InputHelper.toFluid(input), temp));
}
private static class AddHeat extends BaseAction {
@ -187,7 +166,18 @@ public class HighOven {
@Override
public void apply() {
REMOVED_HEAT_RECIPES.put(output, input);
FluidStack output = InputHelper.toFluid(this.output);
if (this.input == null) {
REMOVED_HEAT_RECIPES.put(output, null);
} else if (REMOVED_HEAT_RECIPES.containsKey(output)) {
Set<FluidStack> inputs = REMOVED_HEAT_RECIPES.get(output);
if (inputs != null)
inputs.add(InputHelper.toFluid(input));
} else {
Set<FluidStack> inputs = new HashSet<>();
inputs.add(InputHelper.toFluid(input));
REMOVED_HEAT_RECIPES.put(output, inputs);
}
}
@Override
@ -197,15 +187,16 @@ public class HighOven {
@Override
public String getRecipeInfo() {
return LogHelper.getStackDescription(output);
return LogHelper.getStackDescription(output)
+ ((input == null) ? "" : (" from " + LogHelper.getStackDescription(input)));
}
}
@ZenMethod
public static void removeMixRecipe(ILiquidStack output) {
public static void removeMixRecipe(ILiquidStack output, @Optional ILiquidStack input) {
init();
CraftTweakerAPI.apply(new RemoveMix(output));
CraftTweakerAPI.apply(new RemoveMix(output, input));
}
@ZenMethod
@ -216,15 +207,28 @@ public class HighOven {
private static class RemoveMix extends BaseAction {
private ILiquidStack output;
private ILiquidStack input;
public RemoveMix(ILiquidStack output) {
public RemoveMix(ILiquidStack output, ILiquidStack input) {
super("HighOven.MixRecipe");
this.output = output;
this.input = input;
}
@Override
public void apply() {
REMOVED_MIX_RECIPES.add(output);
FluidStack output = InputHelper.toFluid(this.output);
if (this.input == null) {
REMOVED_MIX_RECIPES.put(output, null);
} else if (REMOVED_MIX_RECIPES.containsKey(output)) {
Set<FluidStack> inputs = REMOVED_MIX_RECIPES.get(output);
if (inputs != null)
inputs.add(InputHelper.toFluid(input));
} else {
Set<FluidStack> inputs = new HashSet<>();
inputs.add(InputHelper.toFluid(input));
REMOVED_MIX_RECIPES.put(output, inputs);
}
}
@Override
@ -234,7 +238,8 @@ public class HighOven {
@Override
protected String getRecipeInfo() {
return LogHelper.getStackDescription(output);
return LogHelper.getStackDescription(output)
+ ((input == null) ? "" : (" from " + LogHelper.getStackDescription(input)));
}
}
@ -255,14 +260,15 @@ public class HighOven {
if (event.getRecipe() instanceof HeatRecipeTweaker) {
return;
} else {
for (Map.Entry<ILiquidStack, ILiquidStack> entry : REMOVED_HEAT_RECIPES.entrySet()) {
if (event.getRecipe().getOutput().isFluidEqual((FluidStack) entry.getKey().getInternal())) {
if (entry.getValue() != null) {
if (event.getRecipe().getInput().isFluidEqual((FluidStack) entry.getValue().getInternal())) {
for (Map.Entry<FluidStack, Set<FluidStack>> entry : REMOVED_HEAT_RECIPES.entrySet()) {
if (entry.getValue() == null && event.getRecipe().matches(null, entry.getKey())) {
event.setCanceled(true);
} else {
for (FluidStack input : entry.getValue()) {
if (event.getRecipe().matches(input, entry.getKey())) {
event.setCanceled(true);
break;
}
} else {
event.setCanceled(true);
}
}
}
@ -274,9 +280,16 @@ public class HighOven {
if (event.getRecipe() instanceof MixRecipeTweaker) {
return;
} else {
for (ILiquidStack entry : REMOVED_MIX_RECIPES) {
if (event.getRecipe().getOutput().isFluidEqual((FluidStack) entry.getInternal())) {
for (Map.Entry<FluidStack, Set<FluidStack>> entry : REMOVED_MIX_RECIPES.entrySet()) {
if (entry.getValue() == null && event.getRecipe().matches(null, entry.getKey())) {
event.setCanceled(true);
} else {
for (FluidStack input : entry.getValue()) {
if (event.getRecipe().matches(input, entry.getKey())) {
event.setCanceled(true);
break;
}
}
}
}
}

90
src/main/java/com/blamejared/compat/tcomplement/highoven/MixRecipeHelper.java
View file

@ -5,22 +5,22 @@ import java.util.List;
import java.util.Map;
import com.blamejared.ModTweaker;
import com.blamejared.compat.mantle.RecipeMatchIIngredient;
import com.blamejared.compat.tcomplement.highoven.recipes.MixRecipeTweaker;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.helpers.LogHelper;
import com.blamejared.mtlib.utils.BaseAction;
import com.google.common.collect.ImmutableList;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
import crafttweaker.api.item.IIngredient;
import crafttweaker.api.item.IItemStack;
import crafttweaker.api.liquid.ILiquidStack;
import crafttweaker.api.oredict.IOreDictEntry;
import knightminer.tcomplement.library.TCompRegistry;
import knightminer.tcomplement.library.steelworks.IMixRecipe;
import knightminer.tcomplement.library.steelworks.MixAdditive;
import net.minecraftforge.fluids.FluidStack;
import slimeknights.mantle.util.RecipeMatch;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenGetter;
import stanhebben.zenscript.annotations.ZenMethod;
@ -91,61 +91,34 @@ public class MixRecipeHelper {
@ZenMethod
public int getOxidizerChance(IIngredient oxidizer) {
if (this.oxidizers.containsKey(oxidizer)) {
return this.oxidizers.get(oxidizer);
} else {
return -1;
}
return this.oxidizers.getOrDefault(oxidizer, -1);
}
@ZenMethod
public int getReducerChance(IIngredient reducer) {
if (this.reducers.containsKey(reducer)) {
return this.reducers.get(reducer);
} else {
return -1;
}
return this.reducers.getOrDefault(reducer, -1);
}
@ZenMethod
public int getPurifierChance(IIngredient purifier) {
if (this.purifiers.containsKey(purifier)) {
return this.purifiers.get(purifier);
} else {
return -1;
}
return this.purifiers.getOrDefault(purifier, -1);
}
@ZenMethod
public MixRecipeHelper addOxidizer(IIngredient oxidizer, int consumeChance) {
if (oxidizer instanceof IItemStack || oxidizer instanceof IOreDictEntry) {
this.oxidizers.put(oxidizer, consumeChance);
} else {
CraftTweakerAPI.logWarning("addOxidizer only supports IItemStack or IOreDictEntry, ignored oxidizer "
+ LogHelper.getStackDescription(oxidizer) + " of type " + oxidizer.getClass().getSimpleName());
}
this.oxidizers.put(oxidizer, consumeChance);
return this;
}
@ZenMethod
public MixRecipeHelper addReducer(IIngredient reducer, int consumeChance) {
if (reducer instanceof IItemStack || reducer instanceof IOreDictEntry) {
this.reducers.put(reducer, consumeChance);
} else {
CraftTweakerAPI.logWarning("addReducer only supports IItemStack or IOreDictEntry, ignored reducer "
+ LogHelper.getStackDescription(reducer) + " of type " + reducer.getClass().getSimpleName());
}
this.reducers.put(reducer, consumeChance);
return this;
}
@ZenMethod
public MixRecipeHelper addPurifier(IIngredient purifier, int consumeChance) {
if (purifier instanceof IItemStack || purifier instanceof IOreDictEntry) {
this.purifiers.put(purifier, consumeChance);
} else {
CraftTweakerAPI.logWarning("addPurifier only supports IItemStack or IOreDictEntry, ignored purifier "
+ LogHelper.getStackDescription(purifier) + " of type " + purifier.getClass().getSimpleName());
}
this.purifiers.put(purifier, consumeChance);
return this;
}
@ -188,60 +161,45 @@ public class MixRecipeHelper {
@ZenMethod
public void register() {
ModTweaker.LATE_ADDITIONS.add(
new AddMixRecipe(this.output, this.input, this.temp + 300, this.oxidizers, this.reducers, this.purifiers));
new AddMixRecipe(this.output, this.input, this.temp, this.oxidizers, this.reducers, this.purifiers));
}
private static class AddMixRecipe extends BaseAction {
private FluidStack input, output;
private int temp;
private Map<IIngredient, Integer> oxydizers, reducers, purifiers;
private Map<RecipeMatch, MixAdditive> additives;
public AddMixRecipe(ILiquidStack output, ILiquidStack input, int temp, Map<IIngredient, Integer> oxydizers,
public AddMixRecipe(ILiquidStack output, ILiquidStack input, int temp, Map<IIngredient, Integer> oxidizers,
Map<IIngredient, Integer> reducers, Map<IIngredient, Integer> purifiers) {
super("HighOven.MixRecipe");
this.input = InputHelper.toFluid(input);
this.output = InputHelper.toFluid(output);
this.temp = temp;
this.oxydizers = new LinkedHashMap<>();
this.oxydizers.putAll(oxydizers);
this.reducers = new LinkedHashMap<>();
this.reducers.putAll(reducers);
this.purifiers = new LinkedHashMap<>();
this.purifiers.putAll(purifiers);
this.additives = new LinkedHashMap<>();
oxidizers.forEach((IIngredient ingredient, Integer chance) -> this.additives
.put(new RecipeMatchIIngredient(ingredient, chance), MixAdditive.OXIDIZER));
reducers.forEach((IIngredient ingredient, Integer chance) -> this.additives
.put(new RecipeMatchIIngredient(ingredient, chance), MixAdditive.REDUCER));
purifiers.forEach((IIngredient ingredient, Integer chance) -> this.additives
.put(new RecipeMatchIIngredient(ingredient, chance), MixAdditive.PURIFIER));
}
@Override
public void apply() {
IMixRecipe recipe = TCompRegistry.registerMix(
new MixRecipeTweaker(this.input, this.output, this.temp));
for (Map.Entry<IIngredient, Integer> entry : this.oxydizers.entrySet()) {
if (entry.getKey() instanceof IItemStack)
recipe.addOxidizer(InputHelper.toStack((IItemStack) entry.getKey()), entry.getValue());
if (entry.getKey() instanceof IOreDictEntry)
recipe.addOxidizer(((IOreDictEntry) entry.getKey()).getName(), entry.getValue());
}
for (Map.Entry<IIngredient, Integer> entry : this.reducers.entrySet()) {
if (entry.getKey() instanceof IItemStack)
recipe.addReducer(InputHelper.toStack((IItemStack) entry.getKey()), entry.getValue());
if (entry.getKey() instanceof IOreDictEntry)
recipe.addReducer(((IOreDictEntry) entry.getKey()).getName(), entry.getValue());
}
for (Map.Entry<IIngredient, Integer> entry : this.purifiers.entrySet()) {
if (entry.getKey() instanceof IItemStack)
recipe.addPurifier(InputHelper.toStack((IItemStack) entry.getKey()), entry.getValue());
if (entry.getKey() instanceof IOreDictEntry)
recipe.addPurifier(((IOreDictEntry) entry.getKey()).getName(), entry.getValue());
IMixRecipe recipe = TCompRegistry.registerMix(new MixRecipeTweaker(this.input, this.output, this.temp));
for (Map.Entry<RecipeMatch, MixAdditive> entry : this.additives.entrySet()) {
recipe.addAdditive(entry.getValue(), entry.getKey());
}
}
@Override
public String describe() {
return String.format("Adding %s Recipe(s) for %s", this.name, this.getRecipeInfo());
return String.format("Adding %s Recipe for %s", this.name, this.getRecipeInfo());
}
@Override
protected String getRecipeInfo() {
return LogHelper.getStackDescription(LogHelper.getStackDescription(output));
return LogHelper.getStackDescription(output) + " from " + LogHelper.getStackDescription(input);
}
}
}