Removed reach condition for crafting recipes, too much effort to maintain for such a small feature.

Fixed saving modifier settings on closing the gui (don't override onClose() but removed()).
This commit is contained in:
Christian Knaapen
2019-12-23 15:55:32 +01:00
parent df27697ecb
commit 42661f884c
7 changed files with 2 additions and 48 deletions

View File

@@ -25,7 +25,6 @@ import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
import nl.requios.effortlessbuilding.command.CommandReach; import nl.requios.effortlessbuilding.command.CommandReach;
import nl.requios.effortlessbuilding.compatibility.CompatHelper; import nl.requios.effortlessbuilding.compatibility.CompatHelper;
import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler; import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler;
import nl.requios.effortlessbuilding.helper.ReachConditionFactory;
import nl.requios.effortlessbuilding.item.ItemRandomizerBag; import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
import nl.requios.effortlessbuilding.item.ItemReachUpgrade1; import nl.requios.effortlessbuilding.item.ItemReachUpgrade1;
import nl.requios.effortlessbuilding.item.ItemReachUpgrade2; import nl.requios.effortlessbuilding.item.ItemReachUpgrade2;
@@ -44,7 +43,7 @@ public class EffortlessBuilding
{ {
public static final String MODID = "effortlessbuilding"; public static final String MODID = "effortlessbuilding";
public static final String NAME = "Effortless Building"; public static final String NAME = "Effortless Building";
public static final String VERSION = "1.13.2-2.16"; public static final String VERSION = "1.14.4-2.16";
public static EffortlessBuilding instance; public static EffortlessBuilding instance;
@@ -96,9 +95,6 @@ public class EffortlessBuilding
PacketHandler.register(); PacketHandler.register();
//Register recipe condition
CraftingHelper.register(new ResourceLocation(MODID, "enable_reach_upgrades"), new ReachConditionFactory());
//TODO 1.13 config //TODO 1.13 config
// ConfigManager.sync(MODID, Config.Type.INSTANCE); // ConfigManager.sync(MODID, Config.Type.INSTANCE);

View File

@@ -114,7 +114,7 @@ public class ModifierSettingsGui extends Screen {
} }
@Override @Override
public void onClose() { public void removed() {
scrollPane.onGuiClosed(); scrollPane.onGuiClosed();
//save everything //save everything

View File

@@ -1,28 +0,0 @@
package nl.requios.effortlessbuilding.helper;
import com.google.gson.JsonObject;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.common.crafting.IIngredientSerializer;
import nl.requios.effortlessbuilding.BuildConfig;
public class ReachConditionFactory implements IIngredientSerializer {
@Override
public Ingredient parse(PacketBuffer buffer) {
if (BuildConfig.reach.enableReachUpgrades.get())
return Ingredient.read(buffer);
return Ingredient.EMPTY;
}
@Override
public Ingredient parse(JsonObject json) {
if (BuildConfig.reach.enableReachUpgrades.get())
return Ingredient.deserialize(json);
return Ingredient.EMPTY;
}
@Override
public void write(PacketBuffer buffer, Ingredient ingredient) {
ingredient.write(buffer);
}
}

View File

@@ -1,5 +0,0 @@
{
"conditions": {
"enable_reach_upgrades": "nl.requios.effortlessbuilding.helper.ReachConditionFactory"
}
}

View File

@@ -1,7 +1,4 @@
{ {
"conditions": [{
"type": "effortlessbuilding:enable_reach_upgrades"
}],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
" S", " S",

View File

@@ -1,7 +1,4 @@
{ {
"conditions": [{
"type": "effortlessbuilding:enable_reach_upgrades"
}],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
" M", " M",

View File

@@ -1,7 +1,4 @@
{ {
"conditions": [{
"type": "effortlessbuilding:enable_reach_upgrades"
}],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
" FE", " FE",