From f74e7db4dfcb922c1ff419d798afec116adaa141 Mon Sep 17 00:00:00 2001 From: ticticboooom Date: Sun, 20 Feb 2022 20:47:44 +0000 Subject: [PATCH] started on structures and implementation --- .../java/com/ticticboooom/mods/mm/Ref.java | 11 +- .../mods/mm/block/item/MMItemGroup.java | 2 +- .../mods/mm/data/DataRegistry.java | 3 + .../mods/mm/data/model/StructureModel.java | 18 ++++ .../data/reload/ControllerReloadListener.java | 2 +- .../mm/data/reload/PortReloadListener.java | 2 +- .../data/reload/StructureReloadListener.java | 13 ++- .../mods/mm/setup/MMRegistries.java | 28 +++++ .../mods/mm/structures/StructureKeyType.java | 13 +++ .../keys/BlockStructureKeyType.java | 63 +++++++++++ .../structures/keys/PortStructureKeyType.java | 34 ++++++ .../keys/PortTierStructureKeyType.java | 29 +++++ .../blockstates/controller_model.json | 0 .../models/block/base_block.json | 0 .../models/block/projector.json | 0 .../models/block/structure_generator.json | 0 .../textures/block/base_block.png | Bin .../block/base_ports/energy_input_cutout.png | Bin .../block/base_ports/energy_output_cutout.png | Bin .../block/base_ports/fluid_input_cutout.png | Bin .../block/base_ports/fluid_output_cutout.png | Bin .../block/base_ports/item_input_cutout.png | Bin .../block/base_ports/item_output_cutout.png | Bin .../textures/block/circuit_cutout.png | Bin .../astral_starlight_input_cutout.png | Bin .../astral_starlight_output_cutout.png | Bin .../botania_mana_input_cutout.png | Bin .../botania_mana_output_cutout.png | Bin .../create_rotation_input_cutout.png | Bin .../create_rotation_output_cutout.png | Bin .../mekanism_gas_input_cutout.png | Bin .../mekanism_gas_output_cutout.png | Bin .../mekanism_heat_input_cutout.png | Bin .../mekanism_heat_output_cutout.png | Bin .../mekanism_infusion_input_cutout.png | Bin .../mekanism_infusion_output_cutout.png | Bin .../mekanism_laser_input_cutout.png | Bin .../mekanism_laser_output_cutout.png | Bin .../mekanism_pigment_input_cutout.png | Bin .../mekanism_pigment_output_cutout.png | Bin .../mekanism_slurry_input_cutout.png | Bin .../mekanism_slurry_output_cutout.png | Bin .../pncr_pressure_input_cutout.png | Bin .../pncr_pressure_output_cutout.png | Bin .../textures/block/config_generator_base.png | Bin .../block/config_generator_monitor.png | Bin .../textures/block/controller_cutout.png | Bin .../textures/block/gearbox_cutout.png | Bin .../textures/block/projector.png | Bin .../textures/block/vent_cutout.png | Bin .../textures/gui/gui_large.png | Bin .../textures/gui/gui_large_gen.afdesign | Bin .../textures/gui/gui_large_gen.png | Bin .../textures/gui/gui_large_jei.png | Bin .../textures/gui/mana_gui.png | Bin .../textures/gui/port_gui.png | Bin .../textures/gui/slot_parts.png | Bin .../textures/item/blueprint.png | Bin .../textures/item/scanning_tool.png | Bin .../mm}/controllers/main.json | 0 .../mm}/controllers/second.json | 0 .../mm/port_tiers}/item_main.json | 4 +- .../data/test/mm/processes/myrecipe.json | 21 ++++ .../data/test/mm/structures/mystructure.json | 100 ++++++++++++++++++ version.properties | 4 +- 65 files changed, 337 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/ticticboooom/mods/mm/data/model/StructureModel.java create mode 100644 src/main/java/com/ticticboooom/mods/mm/setup/MMRegistries.java create mode 100644 src/main/java/com/ticticboooom/mods/mm/structures/StructureKeyType.java create mode 100644 src/main/java/com/ticticboooom/mods/mm/structures/keys/BlockStructureKeyType.java create mode 100644 src/main/java/com/ticticboooom/mods/mm/structures/keys/PortStructureKeyType.java create mode 100644 src/main/java/com/ticticboooom/mods/mm/structures/keys/PortTierStructureKeyType.java rename src/main/resources/assets/{masterfulmachinery => mm}/blockstates/controller_model.json (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/models/block/base_block.json (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/models/block/projector.json (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/models/block/structure_generator.json (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/base_block.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/base_ports/energy_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/base_ports/energy_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/base_ports/fluid_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/base_ports/fluid_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/base_ports/item_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/base_ports/item_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/circuit_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/astral_starlight_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/astral_starlight_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/botania_mana_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/botania_mana_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/create_rotation_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/create_rotation_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_gas_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_gas_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_heat_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_heat_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_infusion_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_infusion_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_laser_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_laser_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_pigment_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_pigment_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_slurry_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/mekanism_slurry_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/pncr_pressure_input_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/compat_ports/pncr_pressure_output_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/config_generator_base.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/config_generator_monitor.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/controller_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/gearbox_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/projector.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/block/vent_cutout.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/gui/gui_large.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/gui/gui_large_gen.afdesign (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/gui/gui_large_gen.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/gui/gui_large_jei.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/gui/mana_gui.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/gui/port_gui.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/gui/slot_parts.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/item/blueprint.png (100%) rename src/main/resources/assets/{masterfulmachinery => mm}/textures/item/scanning_tool.png (100%) rename src/test/resources/data/{new_mm/masterfulmachinery => test/mm}/controllers/main.json (100%) rename src/test/resources/data/{new_mm/masterfulmachinery => test/mm}/controllers/second.json (100%) rename src/test/resources/data/{new_mm/masterfulmachinery/ports => test/mm/port_tiers}/item_main.json (62%) create mode 100644 src/test/resources/data/test/mm/processes/myrecipe.json create mode 100644 src/test/resources/data/test/mm/structures/mystructure.json diff --git a/src/main/java/com/ticticboooom/mods/mm/Ref.java b/src/main/java/com/ticticboooom/mods/mm/Ref.java index f89b717..c6b00b8 100644 --- a/src/main/java/com/ticticboooom/mods/mm/Ref.java +++ b/src/main/java/com/ticticboooom/mods/mm/Ref.java @@ -4,7 +4,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.system.CallbackI; public class Ref { - public static final String MOD_ID = "masterfulmachinery"; + public static final String MOD_ID = "mm"; public static ResourceLocation res(String path){ return new ResourceLocation(MOD_ID, path); } @@ -15,5 +15,14 @@ public class Ref { public static final ResourceLocation ITEM_TYPE = res("items"); } + public static final class Reg { + public static final ResourceLocation STRUCTURE_KEY_TYPE = res("structures/key_type"); + public static final class SKT { + public static final ResourceLocation BLOCK = res("block"); + public static final ResourceLocation PORT = res("port"); + public static final ResourceLocation PORT_TIER = res("port_tier"); + } + } + public static final ResourceLocation JEI_PLUGIN = res("jei"); } diff --git a/src/main/java/com/ticticboooom/mods/mm/block/item/MMItemGroup.java b/src/main/java/com/ticticboooom/mods/mm/block/item/MMItemGroup.java index ed5ef86..719de76 100644 --- a/src/main/java/com/ticticboooom/mods/mm/block/item/MMItemGroup.java +++ b/src/main/java/com/ticticboooom/mods/mm/block/item/MMItemGroup.java @@ -20,7 +20,7 @@ public class MMItemGroup extends ItemGroup { public static final MMItemGroup INSTANCE = new MMItemGroup(); public MMItemGroup() { - super("masterfulmachinery"); + super("mm"); } @Override diff --git a/src/main/java/com/ticticboooom/mods/mm/data/DataRegistry.java b/src/main/java/com/ticticboooom/mods/mm/data/DataRegistry.java index 0118c5f..5610b2a 100644 --- a/src/main/java/com/ticticboooom/mods/mm/data/DataRegistry.java +++ b/src/main/java/com/ticticboooom/mods/mm/data/DataRegistry.java @@ -1,7 +1,9 @@ package com.ticticboooom.mods.mm.data; +import com.electronwill.nightconfig.core.conversion.ConversionTable; import com.ticticboooom.mods.mm.data.model.ControllerModel; import com.ticticboooom.mods.mm.data.model.PortModel; +import com.ticticboooom.mods.mm.data.model.StructureModel; import net.minecraft.util.ResourceLocation; import java.util.HashMap; @@ -10,4 +12,5 @@ import java.util.Map; public class DataRegistry { public static final Map CONTROLLERS = new HashMap<>(); public static final Map PORTS = new HashMap<>(); + public static final Map STRUCTURES = new HashMap<>(); } diff --git a/src/main/java/com/ticticboooom/mods/mm/data/model/StructureModel.java b/src/main/java/com/ticticboooom/mods/mm/data/model/StructureModel.java new file mode 100644 index 0000000..b06e447 --- /dev/null +++ b/src/main/java/com/ticticboooom/mods/mm/data/model/StructureModel.java @@ -0,0 +1,18 @@ +package com.ticticboooom.mods.mm.data.model; + +import net.minecraft.util.ResourceLocation; + +import java.util.List; +import java.util.Map; + +public class StructureModel { + public ResourceLocation id; + public ResourceLocation controllerId; + public List> pattern; + public Map keys; + + public static final class Key { + public ResourceLocation type; + public Object data; + } +} diff --git a/src/main/java/com/ticticboooom/mods/mm/data/reload/ControllerReloadListener.java b/src/main/java/com/ticticboooom/mods/mm/data/reload/ControllerReloadListener.java index 8a343b7..3733c47 100644 --- a/src/main/java/com/ticticboooom/mods/mm/data/reload/ControllerReloadListener.java +++ b/src/main/java/com/ticticboooom/mods/mm/data/reload/ControllerReloadListener.java @@ -22,7 +22,7 @@ public class ControllerReloadListener extends JsonReloadListener { public static final Gson GSON = new Gson(); public ControllerReloadListener() { - super(GSON, "masterfulmachinery/controllers"); + super(GSON, "mm/controllers"); } @SubscribeEvent diff --git a/src/main/java/com/ticticboooom/mods/mm/data/reload/PortReloadListener.java b/src/main/java/com/ticticboooom/mods/mm/data/reload/PortReloadListener.java index 5fbc200..b8d7fc0 100644 --- a/src/main/java/com/ticticboooom/mods/mm/data/reload/PortReloadListener.java +++ b/src/main/java/com/ticticboooom/mods/mm/data/reload/PortReloadListener.java @@ -22,7 +22,7 @@ public class PortReloadListener extends JsonReloadListener { public static final Gson GSON = new Gson(); public PortReloadListener() { - super(GSON, "masterfulmachinery/ports"); + super(GSON, "mm/port_tiers"); } @SubscribeEvent diff --git a/src/main/java/com/ticticboooom/mods/mm/data/reload/StructureReloadListener.java b/src/main/java/com/ticticboooom/mods/mm/data/reload/StructureReloadListener.java index 26d31a5..916ab98 100644 --- a/src/main/java/com/ticticboooom/mods/mm/data/reload/StructureReloadListener.java +++ b/src/main/java/com/ticticboooom/mods/mm/data/reload/StructureReloadListener.java @@ -2,6 +2,9 @@ package com.ticticboooom.mods.mm.data.reload; import com.google.gson.Gson; import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.ticticboooom.mods.mm.data.DataRegistry; +import com.ticticboooom.mods.mm.data.model.StructureModel; import net.minecraft.client.resources.JsonReloadListener; import net.minecraft.profiler.IProfiler; import net.minecraft.resources.IResourceManager; @@ -17,7 +20,7 @@ public class StructureReloadListener extends JsonReloadListener { public static final Gson GSON = new Gson(); public StructureReloadListener() { - super(GSON, "masterfulmachinery/machines"); + super(GSON, "mm/machines"); } @SubscribeEvent @@ -27,6 +30,12 @@ public class StructureReloadListener extends JsonReloadListener { @Override protected void apply(Map objectIn, IResourceManager resourceManagerIn, IProfiler profilerIn) { - + for (Map.Entry entry : objectIn.entrySet()) { + DataRegistry.STRUCTURES.put(entry.getKey(), parse(entry.getKey(), entry.getValue().getAsJsonObject())); + } + } + + private StructureModel parse(ResourceLocation key, JsonObject asJsonObject) { + } } diff --git a/src/main/java/com/ticticboooom/mods/mm/setup/MMRegistries.java b/src/main/java/com/ticticboooom/mods/mm/setup/MMRegistries.java new file mode 100644 index 0000000..cca4779 --- /dev/null +++ b/src/main/java/com/ticticboooom/mods/mm/setup/MMRegistries.java @@ -0,0 +1,28 @@ +package com.ticticboooom.mods.mm.setup; + +import com.ticticboooom.mods.mm.Ref; +import com.ticticboooom.mods.mm.structures.StructureKeyType; +import com.ticticboooom.mods.mm.structures.keys.BlockStructureKeyType; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.RegistryBuilder; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +public class MMRegistries { + + public static IForgeRegistry STRUCTURE_KEY_TYPES; + + @SubscribeEvent + public static void on(RegistryEvent.NewRegistry event) { + STRUCTURE_KEY_TYPES = new RegistryBuilder().setName(Ref.Reg.STRUCTURE_KEY_TYPE).setType(StructureKeyType.class).create(); + } + + @SubscribeEvent + public static void register(RegistryEvent.Register event) { + event.getRegistry().registerAll( + new BlockStructureKeyType().setRegistryName(Ref.Reg.SKT.BLOCK) + ); + } +} diff --git a/src/main/java/com/ticticboooom/mods/mm/structures/StructureKeyType.java b/src/main/java/com/ticticboooom/mods/mm/structures/StructureKeyType.java new file mode 100644 index 0000000..aa024c1 --- /dev/null +++ b/src/main/java/com/ticticboooom/mods/mm/structures/StructureKeyType.java @@ -0,0 +1,13 @@ +package com.ticticboooom.mods.mm.structures; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistryEntry; + +import java.util.List; + +public abstract class StructureKeyType extends ForgeRegistryEntry { + public abstract boolean matches(JsonElement json); + public abstract Object parse(JsonElement json, List controllerIds, ResourceLocation structureId); +} diff --git a/src/main/java/com/ticticboooom/mods/mm/structures/keys/BlockStructureKeyType.java b/src/main/java/com/ticticboooom/mods/mm/structures/keys/BlockStructureKeyType.java new file mode 100644 index 0000000..e08e15b --- /dev/null +++ b/src/main/java/com/ticticboooom/mods/mm/structures/keys/BlockStructureKeyType.java @@ -0,0 +1,63 @@ +package com.ticticboooom.mods.mm.structures.keys; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.ticticboooom.mods.mm.data.util.ParserUtils; +import com.ticticboooom.mods.mm.structures.StructureKeyType; +import net.minecraft.util.ResourceLocation; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class BlockStructureKeyType extends StructureKeyType { + @Override + public boolean matches(JsonElement json) { + if (json.isJsonPrimitive()){ + return true; + } + if (json.isJsonObject()){ + if (json.getAsJsonObject().has("include")) { + return true; + } + } + return false; + } + + @Override + public Object parse(JsonElement json, List controllerIds, ResourceLocation structureId) { + Value result = new Value(); + result.blockSelector = new ArrayList<>(); + if (json.isJsonPrimitive()) { + result.blockSelector.add(json.getAsString()); + return result; + } + if (json.isJsonObject()) { + JsonObject jsonObj = json.getAsJsonObject(); + JsonElement includesJson = jsonObj.get("include"); + if (includesJson.isJsonPrimitive()) { + result.blockSelector.add(includesJson.getAsString()); + return result; + } + + JsonArray includes = includesJson.getAsJsonArray(); + includes.forEach(x -> result.blockSelector.add(x.getAsString())); + result.properties = ParserUtils.parseOrDefault(jsonObj, "properties", x -> { + HashMap res = new HashMap<>(); + JsonObject obj = x.getAsJsonObject(); + obj.keySet().forEach(z -> { + res.put(z, obj.get(z).getAsString()); + }); + return res; + }, new HashMap<>()); + } + return result; + } + + public static final class Value { + public List blockSelector; + public Map properties; + } +} diff --git a/src/main/java/com/ticticboooom/mods/mm/structures/keys/PortStructureKeyType.java b/src/main/java/com/ticticboooom/mods/mm/structures/keys/PortStructureKeyType.java new file mode 100644 index 0000000..704895a --- /dev/null +++ b/src/main/java/com/ticticboooom/mods/mm/structures/keys/PortStructureKeyType.java @@ -0,0 +1,34 @@ +package com.ticticboooom.mods.mm.structures.keys; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.ticticboooom.mods.mm.Ref; +import com.ticticboooom.mods.mm.data.util.ParserUtils; +import com.ticticboooom.mods.mm.structures.StructureKeyType; +import net.minecraft.util.ResourceLocation; + +import java.util.List; +import java.util.Optional; + +public class PortStructureKeyType extends StructureKeyType { + @Override + public boolean matches(JsonElement json) { + JsonObject obj = json.getAsJsonObject(); + String type = obj.get("type").getAsString(); + return type.equals(Ref.Reg.SKT.PORT.toString()); + } + + @Override + public Object parse(JsonElement json, List controllerIds, ResourceLocation structureId) { + Value result = new Value(); + JsonObject obj = json.getAsJsonObject(); + result.port = ResourceLocation.tryCreate(obj.get("port").getAsString()); + result.input = ParserUtils.parseOrDefault(obj, "input", x -> Optional.of(x.getAsBoolean()), Optional.empty()); + return result; + } + + public static final class Value { + public ResourceLocation port; + public Optional input; + } +} diff --git a/src/main/java/com/ticticboooom/mods/mm/structures/keys/PortTierStructureKeyType.java b/src/main/java/com/ticticboooom/mods/mm/structures/keys/PortTierStructureKeyType.java new file mode 100644 index 0000000..a0d9dbf --- /dev/null +++ b/src/main/java/com/ticticboooom/mods/mm/structures/keys/PortTierStructureKeyType.java @@ -0,0 +1,29 @@ +package com.ticticboooom.mods.mm.structures.keys; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.ticticboooom.mods.mm.Ref; +import com.ticticboooom.mods.mm.data.util.ParserUtils; +import com.ticticboooom.mods.mm.structures.StructureKeyType; +import net.minecraft.util.ResourceLocation; + +import java.util.List; +import java.util.Optional; + +public class PortTierStructureKeyType extends StructureKeyType { + @Override + public boolean matches(JsonElement json) { + JsonObject obj = json.getAsJsonObject(); + String type = obj.get("type").getAsString(); + return type.equals(Ref.Reg.SKT.PORT_TIER.toString()); + } + + @Override + public Object parse(JsonElement json, List controllerIds, ResourceLocation structureId) { + } + + public static final class Value { + public ResourceLocation portTier; + public Optional input; + } +} diff --git a/src/main/resources/assets/masterfulmachinery/blockstates/controller_model.json b/src/main/resources/assets/mm/blockstates/controller_model.json similarity index 100% rename from src/main/resources/assets/masterfulmachinery/blockstates/controller_model.json rename to src/main/resources/assets/mm/blockstates/controller_model.json diff --git a/src/main/resources/assets/masterfulmachinery/models/block/base_block.json b/src/main/resources/assets/mm/models/block/base_block.json similarity index 100% rename from src/main/resources/assets/masterfulmachinery/models/block/base_block.json rename to src/main/resources/assets/mm/models/block/base_block.json diff --git a/src/main/resources/assets/masterfulmachinery/models/block/projector.json b/src/main/resources/assets/mm/models/block/projector.json similarity index 100% rename from src/main/resources/assets/masterfulmachinery/models/block/projector.json rename to src/main/resources/assets/mm/models/block/projector.json diff --git a/src/main/resources/assets/masterfulmachinery/models/block/structure_generator.json b/src/main/resources/assets/mm/models/block/structure_generator.json similarity index 100% rename from src/main/resources/assets/masterfulmachinery/models/block/structure_generator.json rename to src/main/resources/assets/mm/models/block/structure_generator.json diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_block.png b/src/main/resources/assets/mm/textures/block/base_block.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/base_block.png rename to src/main/resources/assets/mm/textures/block/base_block.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_input_cutout.png b/src/main/resources/assets/mm/textures/block/base_ports/energy_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_input_cutout.png rename to src/main/resources/assets/mm/textures/block/base_ports/energy_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_output_cutout.png b/src/main/resources/assets/mm/textures/block/base_ports/energy_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_output_cutout.png rename to src/main/resources/assets/mm/textures/block/base_ports/energy_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_input_cutout.png b/src/main/resources/assets/mm/textures/block/base_ports/fluid_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_input_cutout.png rename to src/main/resources/assets/mm/textures/block/base_ports/fluid_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_output_cutout.png b/src/main/resources/assets/mm/textures/block/base_ports/fluid_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_output_cutout.png rename to src/main/resources/assets/mm/textures/block/base_ports/fluid_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_input_cutout.png b/src/main/resources/assets/mm/textures/block/base_ports/item_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_input_cutout.png rename to src/main/resources/assets/mm/textures/block/base_ports/item_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_output_cutout.png b/src/main/resources/assets/mm/textures/block/base_ports/item_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_output_cutout.png rename to src/main/resources/assets/mm/textures/block/base_ports/item_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/circuit_cutout.png b/src/main/resources/assets/mm/textures/block/circuit_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/circuit_cutout.png rename to src/main/resources/assets/mm/textures/block/circuit_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/astral_starlight_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/astral_starlight_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/astral_starlight_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/astral_starlight_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/botania_mana_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/botania_mana_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/botania_mana_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/botania_mana_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/create_rotation_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/create_rotation_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/create_rotation_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/create_rotation_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_gas_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_gas_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_gas_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_gas_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_heat_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_heat_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_heat_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_heat_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_infusion_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_infusion_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_infusion_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_infusion_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_laser_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_laser_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_laser_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_laser_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_pigment_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_pigment_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_pigment_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_pigment_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_slurry_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_slurry_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/mekanism_slurry_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/mekanism_slurry_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_input_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/pncr_pressure_input_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_input_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/pncr_pressure_input_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_output_cutout.png b/src/main/resources/assets/mm/textures/block/compat_ports/pncr_pressure_output_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_output_cutout.png rename to src/main/resources/assets/mm/textures/block/compat_ports/pncr_pressure_output_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/config_generator_base.png b/src/main/resources/assets/mm/textures/block/config_generator_base.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/config_generator_base.png rename to src/main/resources/assets/mm/textures/block/config_generator_base.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/config_generator_monitor.png b/src/main/resources/assets/mm/textures/block/config_generator_monitor.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/config_generator_monitor.png rename to src/main/resources/assets/mm/textures/block/config_generator_monitor.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/controller_cutout.png b/src/main/resources/assets/mm/textures/block/controller_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/controller_cutout.png rename to src/main/resources/assets/mm/textures/block/controller_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/gearbox_cutout.png b/src/main/resources/assets/mm/textures/block/gearbox_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/gearbox_cutout.png rename to src/main/resources/assets/mm/textures/block/gearbox_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/projector.png b/src/main/resources/assets/mm/textures/block/projector.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/projector.png rename to src/main/resources/assets/mm/textures/block/projector.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/vent_cutout.png b/src/main/resources/assets/mm/textures/block/vent_cutout.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/block/vent_cutout.png rename to src/main/resources/assets/mm/textures/block/vent_cutout.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/gui/gui_large.png b/src/main/resources/assets/mm/textures/gui/gui_large.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/gui/gui_large.png rename to src/main/resources/assets/mm/textures/gui/gui_large.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/gui/gui_large_gen.afdesign b/src/main/resources/assets/mm/textures/gui/gui_large_gen.afdesign similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/gui/gui_large_gen.afdesign rename to src/main/resources/assets/mm/textures/gui/gui_large_gen.afdesign diff --git a/src/main/resources/assets/masterfulmachinery/textures/gui/gui_large_gen.png b/src/main/resources/assets/mm/textures/gui/gui_large_gen.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/gui/gui_large_gen.png rename to src/main/resources/assets/mm/textures/gui/gui_large_gen.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/gui/gui_large_jei.png b/src/main/resources/assets/mm/textures/gui/gui_large_jei.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/gui/gui_large_jei.png rename to src/main/resources/assets/mm/textures/gui/gui_large_jei.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/gui/mana_gui.png b/src/main/resources/assets/mm/textures/gui/mana_gui.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/gui/mana_gui.png rename to src/main/resources/assets/mm/textures/gui/mana_gui.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/gui/port_gui.png b/src/main/resources/assets/mm/textures/gui/port_gui.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/gui/port_gui.png rename to src/main/resources/assets/mm/textures/gui/port_gui.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/gui/slot_parts.png b/src/main/resources/assets/mm/textures/gui/slot_parts.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/gui/slot_parts.png rename to src/main/resources/assets/mm/textures/gui/slot_parts.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/item/blueprint.png b/src/main/resources/assets/mm/textures/item/blueprint.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/item/blueprint.png rename to src/main/resources/assets/mm/textures/item/blueprint.png diff --git a/src/main/resources/assets/masterfulmachinery/textures/item/scanning_tool.png b/src/main/resources/assets/mm/textures/item/scanning_tool.png similarity index 100% rename from src/main/resources/assets/masterfulmachinery/textures/item/scanning_tool.png rename to src/main/resources/assets/mm/textures/item/scanning_tool.png diff --git a/src/test/resources/data/new_mm/masterfulmachinery/controllers/main.json b/src/test/resources/data/test/mm/controllers/main.json similarity index 100% rename from src/test/resources/data/new_mm/masterfulmachinery/controllers/main.json rename to src/test/resources/data/test/mm/controllers/main.json diff --git a/src/test/resources/data/new_mm/masterfulmachinery/controllers/second.json b/src/test/resources/data/test/mm/controllers/second.json similarity index 100% rename from src/test/resources/data/new_mm/masterfulmachinery/controllers/second.json rename to src/test/resources/data/test/mm/controllers/second.json diff --git a/src/test/resources/data/new_mm/masterfulmachinery/ports/item_main.json b/src/test/resources/data/test/mm/port_tiers/item_main.json similarity index 62% rename from src/test/resources/data/new_mm/masterfulmachinery/ports/item_main.json rename to src/test/resources/data/test/mm/port_tiers/item_main.json index 7ff9919..3998414 100644 --- a/src/test/resources/data/new_mm/masterfulmachinery/ports/item_main.json +++ b/src/test/resources/data/test/mm/port_tiers/item_main.json @@ -1,7 +1,7 @@ { - "controllerId": "main", + "controllerId": "test:main", "name": "Main Items", - "type": "masterfulmachinery:items", + "type": "mm:items", "defaultModel": { "block": "minecraft:sponge", "properties": {} diff --git a/src/test/resources/data/test/mm/processes/myrecipe.json b/src/test/resources/data/test/mm/processes/myrecipe.json new file mode 100644 index 0000000..c64d0a7 --- /dev/null +++ b/src/test/resources/data/test/mm/processes/myrecipe.json @@ -0,0 +1,21 @@ +{ + "structure": "test:mystructure", + "inputs": { + "firstboi": { + "type": "mm:modifiable", + "modifier_results": { + "starter": { + "type": "mm:nothing" + }, + "basic": { + "type": "mm:speed", + "ticks": "-10%" + }, + "intermediate": { + "type": "mm:chance", + "chance": "+10%" + } + } + } + } +} \ No newline at end of file diff --git a/src/test/resources/data/test/mm/structures/mystructure.json b/src/test/resources/data/test/mm/structures/mystructure.json new file mode 100644 index 0000000..53dfa1d --- /dev/null +++ b/src/test/resources/data/test/mm/structures/mystructure.json @@ -0,0 +1,100 @@ +{ + "controllerId": [ + "test:main", + "test:second" + ], + "controllerSettings": { + "facing": "west" + }, + "pattern": [ + [ + "ABC", + "DEF", + "GHI" + ], + [ + " ", + " C ", + " " + ], + [ + "KLM", + "NOP", + " " + ] + ], + "keys": { + "A": { + "include": [ + "minecraft:dirt", + "#minecraft:logs" + ] + }, + "B": "minecraft:glass", + "D": "#minecraft:wools", + "E": { + "include": "#minecraft:logs", + "exclude": [ + "minecraft:oak_log" + ] + }, + "F": { + "type": "mm:port_group", + "group": "mygroup" + }, + "G": { + "type": "mm:port_tier", + "portTier": "item_main", + "input": false + }, + "H": { + "type": "mm:port", + "port": "mm:items", + "input": true + }, + "I": { + "type": "mm:modifiable", + "modifiers": { + "starter": "minecraft:air", + "basic": { + "include": [ + "minecraft:stone", + "minecraft:cobblestone" + ] + }, + "intermediate": { + "include": "minecraft:iron_block" + } + } + }, + "J": { + "include": "#minecraft:logs", + "properties": { + "axis": "x" + } + } + }, + "requiredPorts": { + "first": { + "port": "mm:items", + "input": true, + "tiers": [ + "item_main" + ] + }, + "second": { + "port": "mm:fluids", + "input": false + }, + "third": { + "port": "mm:fluids", + "input": true + } + }, + "portGroupings": { + "mygroup": [ + "first", + "third" + ] + } +} \ No newline at end of file diff --git a/version.properties b/version.properties index 3c3864f..f8efebd 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -#Mon Feb 07 23:27:43 GMT 2022 -VERSION_CODE=1356 +#Thu Feb 17 07:48:47 GMT 2022 +VERSION_CODE=1358