mirror of
https://github.com/GTNewHorizons/ModTweaker.git
synced 2026-11-20 04:19:44 +00:00
Fix Mekanism class references (#7)
* Fix Mekanism class references SolarEvaporation.java -> ThermalrEvaporation.java * Fix Mekanism class references SolarEvaporation.java -> ThermalrEvaporation.java * Update Dependencies & Buildscript * Apply Spotless * Update dependencies.gradle --------- Co-authored-by: Martin Robertz <[email protected]>
This commit is contained in:
1 parent
cdad0db4c0
commit
e460e3e768
8 files changed
+33
-32
No files matched your search
@@ -20,8 +20,8 @@ import modtweaker2.mods.mekanism.handlers.Purification;
|
||||
import modtweaker2.mods.mekanism.handlers.Reaction;
|
||||
import modtweaker2.mods.mekanism.handlers.Sawmill;
|
||||
import modtweaker2.mods.mekanism.handlers.Separator;
|
||||
import modtweaker2.mods.mekanism.handlers.SolarEvaporation;
|
||||
import modtweaker2.mods.mekanism.handlers.SolarNeutronActivator;
|
||||
import modtweaker2.mods.mekanism.handlers.ThermalEvaporation;
|
||||
import modtweaker2.utils.TweakerPlugin;
|
||||
|
||||
public class Mekanism extends TweakerPlugin {
|
||||
@@ -46,7 +46,7 @@ public class Mekanism extends TweakerPlugin {
|
||||
MineTweakerAPI.registerClass(Reaction.class);
|
||||
MineTweakerAPI.registerClass(Sawmill.class);
|
||||
MineTweakerAPI.registerClass(Separator.class);
|
||||
MineTweakerAPI.registerClass(SolarEvaporation.class);
|
||||
MineTweakerAPI.registerClass(ThermalEvaporation.class);
|
||||
MineTweakerAPI.registerClass(SolarNeutronActivator.class);
|
||||
}
|
||||
}
|
||||
@@ -21,8 +21,8 @@ import mekanism.common.recipe.machines.PurificationRecipe;
|
||||
import mekanism.common.recipe.machines.SawmillRecipe;
|
||||
import mekanism.common.recipe.machines.SeparatorRecipe;
|
||||
import mekanism.common.recipe.machines.SmeltingRecipe;
|
||||
import mekanism.common.recipe.machines.SolarEvaporationRecipe;
|
||||
import mekanism.common.recipe.machines.SolarNeutronRecipe;
|
||||
import mekanism.common.recipe.machines.ThermalEvaporationRecipe;
|
||||
import mekanism.common.recipe.machines.WasherRecipe;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.MineTweakerImplementationAPI;
|
||||
@@ -42,7 +42,7 @@ public class MekanismLogger implements ICommandFunction {
|
||||
validArguments.add("Crystallizer");
|
||||
validArguments.add("Dissolution");
|
||||
validArguments.add("Enrichment");
|
||||
validArguments.add("SolarEvaporation");
|
||||
validArguments.add("ThermalEvaporation");
|
||||
validArguments.add("Infuser");
|
||||
validArguments.add("Injection");
|
||||
validArguments.add("SolarNeutronActivator");
|
||||
@@ -260,12 +260,12 @@ public class MekanismLogger implements ICommandFunction {
|
||||
}
|
||||
}
|
||||
|
||||
if (args.isEmpty() || args.contains("SolarEvaporation")) {
|
||||
for (SolarEvaporationRecipe recipe : (Collection<SolarEvaporationRecipe>) Recipe.SOLAR_EVAPORATION_PLANT
|
||||
if (args.isEmpty() || args.contains("ThermalEvaporation")) {
|
||||
for (ThermalEvaporationRecipe recipe : (Collection<ThermalEvaporationRecipe>) Recipe.THERMAL_EVAPORATION_PLANT
|
||||
.get().values()) {
|
||||
MineTweakerAPI.logCommand(
|
||||
String.format(
|
||||
"mods.mekanism.SolarEvaporation.addRecipe(%s, %s);",
|
||||
"mods.mekanism.ThermalEvaporation.addRecipe(%s, %s);",
|
||||
LogHelper.getStackDescription(recipe.recipeInput.ingredient),
|
||||
LogHelper.getStackDescription(recipe.recipeOutput.output)));
|
||||
}
|
||||
|
||||
+8
-8
@@ -10,7 +10,7 @@ import mekanism.common.recipe.RecipeHandler.Recipe;
|
||||
import mekanism.common.recipe.inputs.FluidInput;
|
||||
import mekanism.common.recipe.inputs.MachineInput;
|
||||
import mekanism.common.recipe.machines.MachineRecipe;
|
||||
import mekanism.common.recipe.machines.SolarEvaporationRecipe;
|
||||
import mekanism.common.recipe.machines.ThermalEvaporationRecipe;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IngredientAny;
|
||||
@@ -24,10 +24,10 @@ import stanhebben.zenscript.annotations.Optional;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenMethod;
|
||||
|
||||
@ZenClass("mods.mekanism.SolarEvaporation")
|
||||
public class SolarEvaporation {
|
||||
@ZenClass("mods.mekanism.ThermalEvaporation")
|
||||
public class ThermalEvaporation {
|
||||
|
||||
public static final String name = "Mekanism Solar Evaporation";
|
||||
public static final String name = "Mekanism Thermal Evaporation";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -39,9 +39,9 @@ public class SolarEvaporation {
|
||||
return;
|
||||
}
|
||||
|
||||
SolarEvaporationRecipe recipe = new SolarEvaporationRecipe(toFluid(liquidInput), toFluid(liquidOutput));
|
||||
ThermalEvaporationRecipe recipe = new ThermalEvaporationRecipe(toFluid(liquidInput), toFluid(liquidOutput));
|
||||
|
||||
MineTweakerAPI.apply(new AddMekanismRecipe(name, Recipe.SOLAR_EVAPORATION_PLANT.get(), recipe));
|
||||
MineTweakerAPI.apply(new AddMekanismRecipe(name, Recipe.THERMAL_EVAPORATION_PLANT.get(), recipe));
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -58,7 +58,7 @@ public class SolarEvaporation {
|
||||
|
||||
Map<MachineInput, MachineRecipe> recipes = new HashMap<MachineInput, MachineRecipe>();
|
||||
|
||||
for (Entry<FluidInput, SolarEvaporationRecipe> entry : ((Map<FluidInput, SolarEvaporationRecipe>) Recipe.SOLAR_EVAPORATION_PLANT
|
||||
for (Entry<FluidInput, ThermalEvaporationRecipe> entry : ((Map<FluidInput, ThermalEvaporationRecipe>) Recipe.THERMAL_EVAPORATION_PLANT
|
||||
.get()).entrySet()) {
|
||||
ILiquidStack inputLiquid = InputHelper.toILiquidStack(entry.getKey().ingredient);
|
||||
ILiquidStack outputLiquid = InputHelper.toILiquidStack(entry.getValue().recipeOutput.output);
|
||||
@@ -70,7 +70,7 @@ public class SolarEvaporation {
|
||||
}
|
||||
|
||||
if (!recipes.isEmpty()) {
|
||||
MineTweakerAPI.apply(new RemoveMekanismRecipe(name, Recipe.SOLAR_EVAPORATION_PLANT.get(), recipes));
|
||||
MineTweakerAPI.apply(new RemoveMekanismRecipe(name, Recipe.THERMAL_EVAPORATION_PLANT.get(), recipes));
|
||||
} else {
|
||||
LogHelper.logWarning(
|
||||
String.format(
|
||||
Reference in new issue
Block a user