diff --git a/.gitignore b/.gitignore index eb80e7db4..82f0acc81 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ changelog.txt /logs/ /classes/ /src/main/resources/package-lock.json -/src/generated +/src/main/generated /RebornCore/.gradle /RebornCore/build \ No newline at end of file diff --git a/RebornCore/build.gradle b/RebornCore/build.gradle index b33e30e37..ecc46347d 100644 --- a/RebornCore/build.gradle +++ b/RebornCore/build.gradle @@ -17,7 +17,7 @@ curseforge { id = "237903" changelog = ENV.CHANGELOG ?: "No changelog provided" releaseType = ENV.RELEASE_CHANNEL ?: "release" - addGameVersion "1.18" + addGameVersion "1.18.1" addGameVersion "Fabric" mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) diff --git a/RebornCore/src/main/java/reborncore/RebornCore.java b/RebornCore/src/main/java/reborncore/RebornCore.java index ce05826a5..6604cbb14 100644 --- a/RebornCore/src/main/java/reborncore/RebornCore.java +++ b/RebornCore/src/main/java/reborncore/RebornCore.java @@ -27,21 +27,23 @@ package reborncore; import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerBlockEntityEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; import net.fabricmc.fabric.api.event.world.WorldTickCallback; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.util.Identifier; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import reborncore.api.ToolManager; import reborncore.api.blockentity.UnloadHandler; import reborncore.common.RebornCoreCommands; import reborncore.common.RebornCoreConfig; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blocks.BlockWrenchEventHandler; +import reborncore.common.chunkloading.ChunkLoaderManager; import reborncore.common.config.Configuration; import reborncore.common.crafting.ingredient.IngredientManager; -import reborncore.common.fluid.RebornFluidManager; import reborncore.common.misc.ModSounds; import reborncore.common.misc.RebornCoreTags; import reborncore.common.multiblock.MultiblockRegistry; @@ -63,7 +65,7 @@ public class RebornCore implements ModInitializer { public static final String MOD_VERSION = "@MODVERSION@"; public static final String WEB_URL = "https://files.modmuss50.me/"; - public static final Logger LOGGER = LogManager.getFormatterLogger(MOD_ID); + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); public static File configDir; public static boolean LOADED = false; @@ -107,7 +109,6 @@ public class RebornCore implements ModInitializer { ServerBoundPackets.init(); IngredientManager.setup(); - RebornFluidManager.setupBucketMap(); RebornCoreCommands.setup(); @@ -119,6 +120,9 @@ public class RebornCore implements ModInitializer { if (blockEntity instanceof UnloadHandler) ((UnloadHandler) blockEntity).onUnload(); }); + ServerWorldEvents.LOAD.register((server, world) -> ChunkLoaderManager.get(world).onServerWorldLoad(world)); + ServerTickEvents.START_WORLD_TICK.register(world -> ChunkLoaderManager.get(world).onServerWorldTick(world)); + FluidStorage.SIDED.registerFallback((world, pos, state, be, direction) -> { if (be instanceof MachineBaseBlockEntity machineBase) { return machineBase.getTank(); diff --git a/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java b/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java index d6ef0f471..41e26b44f 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java +++ b/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java @@ -26,10 +26,9 @@ package reborncore.client.gui.builder.widget; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; -import org.apache.logging.log4j.util.TriConsumer; +import reborncore.common.misc.TriConsumer; - -public class GuiButtonExtended extends GuiButtonSimple { +public class GuiButtonExtended extends ButtonWidget { private TriConsumer clickHandler; @@ -51,6 +50,6 @@ public class GuiButtonExtended extends GuiButtonSimple { if (clickHandler != null) { clickHandler.accept(this, mouseX, mouseY); } - super.onClick(mouseY, mouseY); + super.onClick(mouseX, mouseY); } } diff --git a/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonSimple.java b/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonSimple.java index c1e0488e1..543e27d51 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonSimple.java +++ b/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonSimple.java @@ -28,10 +28,19 @@ import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; public class GuiButtonSimple extends ButtonWidget { + + /** + * @deprecated Please use {@link ButtonWidget} + */ + @Deprecated public GuiButtonSimple(int x, int y, Text buttonText, ButtonWidget.PressAction pressAction) { super(x, y, 20, 200, buttonText, pressAction); } + /** + * @deprecated Please use {@link ButtonWidget} + */ + @Deprecated public GuiButtonSimple(int x, int y, int widthIn, int heightIn, Text buttonText, ButtonWidget.PressAction pressAction) { super(x, y, widthIn, heightIn, buttonText, pressAction); } diff --git a/RebornCore/src/main/java/reborncore/client/gui/guibuilder/GuiBuilder.java b/RebornCore/src/main/java/reborncore/client/gui/guibuilder/GuiBuilder.java index 359a290a6..a4a53e92b 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/guibuilder/GuiBuilder.java +++ b/RebornCore/src/main/java/reborncore/client/gui/guibuilder/GuiBuilder.java @@ -26,7 +26,6 @@ package reborncore.client.gui.guibuilder; import com.google.common.collect.Lists; import com.mojang.blaze3d.systems.RenderSystem; -import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; @@ -52,12 +51,11 @@ import reborncore.api.IListInfoProvider; import reborncore.client.RenderUtil; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.slot.GuiTab; -import reborncore.common.fluid.FluidUtil; +import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.FluidValue; import reborncore.common.fluid.container.FluidInstance; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem.EnergySystem; -import reborncore.common.util.FluidTextHelper; import reborncore.common.util.StringUtils; import java.util.ArrayList; @@ -682,7 +680,7 @@ public class GuiBuilder { new LiteralText(String.format("%s / %s", amount, maxCapacity)) .formatted(Formatting.GOLD) .append(SPACE_TEXT) - .append(FluidUtil.getFluidName(fluid)) + .append(FluidUtils.getFluidName(fluid)) ); } diff --git a/RebornCore/src/main/java/reborncore/client/screen/builder/BlockEntityScreenHandlerBuilder.java b/RebornCore/src/main/java/reborncore/client/screen/builder/BlockEntityScreenHandlerBuilder.java index 6db3d823d..e89b83091 100644 --- a/RebornCore/src/main/java/reborncore/client/screen/builder/BlockEntityScreenHandlerBuilder.java +++ b/RebornCore/src/main/java/reborncore/client/screen/builder/BlockEntityScreenHandlerBuilder.java @@ -26,9 +26,6 @@ package reborncore.client.screen.builder; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; -import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.item.base.SingleStackStorage; import net.minecraft.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.block.entity.BlockEntity; import net.minecraft.inventory.CraftingInventory; @@ -49,7 +46,7 @@ import reborncore.client.gui.slots.SlotOutput; import reborncore.client.screen.builder.slot.FilteredSlot; import reborncore.client.screen.builder.slot.UpgradeSlot; import reborncore.common.blockentity.MachineBaseBlockEntity; -import reborncore.common.fluid.container.ItemFluidInfo; +import reborncore.common.fluid.FluidUtils; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import team.reborn.energy.api.EnergyStorageUtil; @@ -114,8 +111,7 @@ public class BlockEntityScreenHandlerBuilder { } public BlockEntityScreenHandlerBuilder fluidSlot(final int index, final int x, final int y) { - this.parent.slots.add(new FilteredSlot(this.inventory, index, x, y).setFilter( - stack -> stack.getItem() instanceof ItemFluidInfo)); + this.parent.slots.add(new FilteredSlot(this.inventory, index, x, y).setFilter(FluidUtils::isContainer)); return this; } diff --git a/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java b/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java index debb19671..076d8e6aa 100644 --- a/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java +++ b/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java @@ -37,8 +37,8 @@ import net.minecraft.screen.slot.Slot; import net.minecraft.util.math.BlockPos; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.Pair; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.network.ClientBoundPackets; import reborncore.common.network.NetworkManager; @@ -54,7 +54,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; public class BuiltScreenHandler extends ScreenHandler { - private static final Logger LOGGER = LogManager.getLogger(); + private static final Logger LOGGER = LoggerFactory.getLogger(BuiltScreenHandler.class); private final String name; diff --git a/RebornCore/src/main/java/reborncore/common/blockentity/FluidConfiguration.java b/RebornCore/src/main/java/reborncore/common/blockentity/FluidConfiguration.java index 75acb6d9a..94946ed6c 100644 --- a/RebornCore/src/main/java/reborncore/common/blockentity/FluidConfiguration.java +++ b/RebornCore/src/main/java/reborncore/common/blockentity/FluidConfiguration.java @@ -28,15 +28,12 @@ import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.nbt.NbtCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import reborncore.common.fluid.FluidUtil; import reborncore.common.util.NBTSerializable; -import reborncore.common.util.Tank; import java.util.ArrayList; import java.util.Arrays; diff --git a/RebornCore/src/main/java/reborncore/common/blocks/BlockMachineBase.java b/RebornCore/src/main/java/reborncore/common/blocks/BlockMachineBase.java index 84357e68b..69ebeddca 100644 --- a/RebornCore/src/main/java/reborncore/common/blocks/BlockMachineBase.java +++ b/RebornCore/src/main/java/reborncore/common/blocks/BlockMachineBase.java @@ -56,7 +56,7 @@ import reborncore.api.blockentity.IUpgrade; import reborncore.api.blockentity.IUpgradeable; import reborncore.common.BaseBlockEntityProvider; import reborncore.common.blockentity.MachineBaseBlockEntity; -import reborncore.common.fluid.FluidUtil; +import reborncore.common.fluid.FluidUtils; import reborncore.common.util.ItemHandlerUtils; import reborncore.common.util.Tank; import reborncore.common.util.WrenchUtils; @@ -187,7 +187,7 @@ public abstract class BlockMachineBase extends BaseBlockEntityProvider implement if (blockEntity instanceof MachineBaseBlockEntity) { Tank tank = ((MachineBaseBlockEntity) blockEntity).getTank(); - if (tank != null && FluidUtil.interactWithFluidHandler(playerIn, hand, tank)) { + if (tank != null && FluidUtils.interactWithFluidHandler(playerIn, hand, tank)) { return ActionResult.SUCCESS; } } diff --git a/RebornCore/src/main/java/reborncore/common/chunkloading/ChunkLoaderManager.java b/RebornCore/src/main/java/reborncore/common/chunkloading/ChunkLoaderManager.java index 1ac6a7d44..1083d5a60 100644 --- a/RebornCore/src/main/java/reborncore/common/chunkloading/ChunkLoaderManager.java +++ b/RebornCore/src/main/java/reborncore/common/chunkloading/ChunkLoaderManager.java @@ -27,6 +27,7 @@ package reborncore.common.chunkloading; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtElement; import net.minecraft.nbt.NbtOps; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ChunkTicketType; @@ -70,7 +71,7 @@ public class ChunkLoaderManager extends PersistentState { chunkLoaderManager.loadedChunks.clear(); - List chunks = CODEC.parse(NbtOps.INSTANCE, tag.getCompound("loadedchunks")) + List chunks = CODEC.parse(NbtOps.INSTANCE, tag.getList("loadedchunks", NbtElement.COMPOUND_TYPE)) .result() .orElse(Collections.emptyList()); @@ -123,8 +124,7 @@ public class ChunkLoaderManager extends PersistentState { LoadedChunk loadedChunk = new LoadedChunk(chunkPos, getWorldName(world), player, chunkLoader); loadedChunks.add(loadedChunk); - final ServerChunkManager serverChunkManager = ((ServerWorld) world).getChunkManager(); - serverChunkManager.addTicket(ChunkLoaderManager.CHUNK_LOADER, loadedChunk.getChunk(), RADIUS, loadedChunk.getChunk()); + loadChunk((ServerWorld) world, loadedChunk); markDirty(); } @@ -148,6 +148,16 @@ public class ChunkLoaderManager extends PersistentState { markDirty(); } + public void onServerWorldLoad(ServerWorld world) { + loadedChunks.forEach(loadedChunk -> loadChunk(world, loadedChunk)); + } + + public void onServerWorldTick(ServerWorld world) { + if (!loadedChunks.isEmpty()) { + world.resetIdleTimeout(); + } + } + public static Identifier getWorldName(World world){ return world.getRegistryKey().getValue(); } @@ -172,6 +182,11 @@ public class ChunkLoaderManager extends PersistentState { NetworkManager.sendToPlayer(ClientBoundPackets.createPacketSyncLoadedChunks(chunks), serverPlayerEntity); } + private void loadChunk(ServerWorld world, LoadedChunk loadedChunk) { + ChunkPos chunkPos = loadedChunk.getChunk(); + world.getChunkManager().addTicket(ChunkLoaderManager.CHUNK_LOADER, chunkPos, RADIUS, chunkPos); + } + public static class LoadedChunk { public static Codec CHUNK_POS_CODEC = RecordCodecBuilder.create(instance -> diff --git a/RebornCore/src/main/java/reborncore/common/crafting/ConditionManager.java b/RebornCore/src/main/java/reborncore/common/crafting/ConditionManager.java deleted file mode 100644 index 8e39966d0..000000000 --- a/RebornCore/src/main/java/reborncore/common/crafting/ConditionManager.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * This file is part of RebornCore, licensed under the MIT License (MIT). - * - * Copyright (c) 2021 TeamReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package reborncore.common.crafting; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.tag.ItemTags; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.SimpleRegistry; -import org.apache.commons.lang3.Validate; - -import java.util.HashMap; -import java.util.function.Function; - -public final class ConditionManager { - - private static final HashMap> RECIPE_CONDITIONS = new HashMap<>(); - private static final HashMap> RECIPE_CONDITION_TYPES = new HashMap<>(); - - static { - //Only loads the recipe in a development env - register("development", Boolean.class, (bool) -> bool == FabricLoader.getInstance().isDevelopmentEnvironment()); - - //Only loads the recipe when the item is registered - register("item", Identifier.class, (id) -> registryContains(Registry.ITEM, id)); - - //Only loads the recipe when the fluid is registered - register("fluid", Identifier.class, (id) -> registryContains(Registry.FLUID, id)); - - //Only loads the recipe when the tag is loaded - register("tag", Identifier.class, s -> ItemTags.getTagGroup().getTags().containsKey(s)); - - //Only load the recipe if the provided mod is loaded - register("mod", String.class, s -> FabricLoader.getInstance().isModLoaded(s)); - - //Never load, just pass whatever in as the string - register("never", String.class, s -> false); - } - - private static boolean registryContains(SimpleRegistry registry, Identifier ident) { - return registry.containsId(ident); - } - - public static void register(String name, Class type, RecipeCondition recipeCondition){ - register(new Identifier("reborncore", name), type, recipeCondition); - } - - public static void register(Identifier identifier, Class type, RecipeCondition recipeCondition){ - Validate.isTrue(!RECIPE_CONDITIONS.containsKey(identifier), "Recipe condition already registered"); - RECIPE_CONDITIONS.put(identifier, recipeCondition); - RECIPE_CONDITION_TYPES.put(identifier, type); - } - - public static RecipeCondition getRecipeCondition(Identifier identifier){ - RecipeCondition condition = RECIPE_CONDITIONS.get(identifier); - if(condition == null){ - throw new UnsupportedOperationException("Could not find recipe condition for " + identifier.toString()); - } - return condition; - } - - public static boolean shouldLoadRecipe(JsonObject jsonObject){ - if(!jsonObject.has("conditions")) return true; - return jsonObject.get("conditions").getAsJsonObject().entrySet().stream() - .allMatch(entry -> shouldLoad(entry.getKey(), entry.getValue())); - } - - public static boolean shouldLoad(String ident, JsonElement jsonElement){ - Identifier identifier = parseIdent(ident); - RecipeCondition recipeCondition = getRecipeCondition(identifier); - Class type = RECIPE_CONDITION_TYPES.get(identifier); - return shouldLoad(type, jsonElement, recipeCondition); - } - - @SuppressWarnings("unchecked") - private static boolean shouldLoad(Class type, JsonElement jsonElement, RecipeCondition recipeCondition){ - Object val = TypeHelper.getValue(type, jsonElement); - return recipeCondition.shouldLoad(val); - } - - private static Identifier parseIdent(String string) { - if(string.contains(":")){ - return new Identifier(string); - } - return new Identifier("reborncore", string); - } - - @FunctionalInterface - public interface RecipeCondition { - boolean shouldLoad(T t); - } - - private static class TypeHelper { - - private static final HashMap, Function> FUNCTIONS = new HashMap<>(); - - static { - register(String.class, JsonElement::getAsString); - register(Boolean.class, JsonElement::getAsBoolean); - - register(Identifier.class, element -> new Identifier(element.getAsString())); - } - - private static void register(Class type, Function function){ - Validate.isTrue(!FUNCTIONS.containsKey(type), "Function for this class is already registered"); - FUNCTIONS.put(type, function); - } - - public static T getValue(Class type, JsonElement jsonElement){ - Validate.isTrue(FUNCTIONS.containsKey(type), "Function for this class could not be found"); - //noinspection unchecked - return (T) FUNCTIONS.get(type).apply(jsonElement); - } - - } -} diff --git a/RebornCore/src/main/java/reborncore/common/crafting/RebornRecipeType.java b/RebornCore/src/main/java/reborncore/common/crafting/RebornRecipeType.java index dcc8e4eda..c175c3b8b 100644 --- a/RebornCore/src/main/java/reborncore/common/crafting/RebornRecipeType.java +++ b/RebornCore/src/main/java/reborncore/common/crafting/RebornRecipeType.java @@ -52,10 +52,6 @@ public record RebornRecipeType( try { R recipe = newRecipe(json, recipeId); - if (!ConditionManager.shouldLoadRecipe(json)) { - return recipeSerde.createDummy(this, recipeId); - } - return recipe; } catch (Throwable t) { RebornCore.LOGGER.error("Failed to read recipe: " + recipeId, t); diff --git a/RebornCore/src/main/java/reborncore/common/fluid/FluidUtil.java b/RebornCore/src/main/java/reborncore/common/fluid/FluidUtil.java deleted file mode 100644 index 5a8ac313f..000000000 --- a/RebornCore/src/main/java/reborncore/common/fluid/FluidUtil.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of RebornCore, licensed under the MIT License (MIT). - * - * Copyright (c) 2021 TeamReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package reborncore.common.fluid; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.Fluids; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Hand; -import net.minecraft.util.registry.Registry; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; -import reborncore.common.fluid.container.FluidInstance; -import reborncore.common.util.Tank; - - -public class FluidUtil { - - @Deprecated - public static FluidInstance getFluidHandler(ItemStack stack) { - return null; - } - - @Deprecated - public static boolean interactWithFluidHandler(PlayerEntity playerIn, Hand hand, Tank tank) { - return false; - } - - @Deprecated - public static ItemStack getFilledBucket(FluidInstance stack) { - return null; - } - - public static String getFluidName(@NotNull FluidInstance fluidInstance) { - // TODO: use FluidVariantRendering - return getFluidName(fluidInstance.getFluid()); - } - - public static String getFluidName(@NotNull Fluid fluid) { - return StringUtils.capitalize(Registry.FLUID.getId(fluid).getPath()); - } -} diff --git a/RebornCore/src/main/java/reborncore/common/fluid/FluidUtils.java b/RebornCore/src/main/java/reborncore/common/fluid/FluidUtils.java new file mode 100644 index 000000000..2318c10f3 --- /dev/null +++ b/RebornCore/src/main/java/reborncore/common/fluid/FluidUtils.java @@ -0,0 +1,188 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2020 TechReborn + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package reborncore.common.fluid; + +import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; +import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; +import net.fabricmc.fabric.api.transfer.v1.storage.base.FilteringStorage; +import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; +import net.minecraft.block.Block; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Hand; +import net.minecraft.util.registry.Registry; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import reborncore.common.fluid.container.FluidInstance; +import reborncore.common.util.Tank; +import reborncore.mixin.common.AccessorFluidBlock; + +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +public class FluidUtils { + + @NotNull + public static Fluid fluidFromBlock(Block block) { + if (block instanceof AccessorFluidBlock) { + return ((AccessorFluidBlock) block).getFluid(); + } + return Fluids.EMPTY; + } + + public static List getAllFluids() { + return Registry.FLUID.stream().collect(Collectors.toList()); + } + + public static boolean drainContainers(Tank tank, Inventory inventory, int inputSlot, int outputSlot) { + return drainContainers(tank, inventory, inputSlot, outputSlot, false); + } + + public static boolean drainContainers(Tank tank, Inventory inventory, int inputSlot, int outputSlot, boolean voidFluid) { + Storage itemStorage = getItemFluidStorage(inventory, inputSlot, outputSlot); + + if (voidFluid) { + // Just extract as much as we can + try (Transaction tx = Transaction.openOuter()) { + boolean didSomething = false; + for (var view : itemStorage.iterable(tx)) { + if (view.isResourceBlank()) continue; + + didSomething = didSomething | view.extract(view.getResource(), Long.MAX_VALUE, tx) > 0; + } + tx.commit(); + return didSomething; + } + } else { + return StorageUtil.move(itemStorage, tank, fv -> true, Long.MAX_VALUE, null) > 0; + } + } + + public static boolean fillContainers(Tank source, Inventory inventory, int inputSlot, int outputSlot) { + return StorageUtil.move( + source, + getItemFluidStorage(inventory, inputSlot, outputSlot), + fv -> true, + Long.MAX_VALUE, + null + ) > 0; + } + + private static Storage getItemFluidStorage(Inventory inventory, int inputSlot, int outputSlot) { + var invWrapper = InventoryStorage.of(inventory, null); + var input = invWrapper.getSlot(inputSlot); + var output = invWrapper.getSlot(outputSlot); + var context = new ContainerItemContext() { + @Override + public SingleSlotStorage getMainSlot() { + return input; + } + + @Override + public long insertOverflow(ItemVariant itemVariant, long maxAmount, TransactionContext transactionContext) { + return output.insert(itemVariant, maxAmount, transactionContext); + } + + @Override + public long insert(ItemVariant itemVariant, long maxAmount, TransactionContext transaction) { + // Don't allow insertion in the input slot + return insertOverflow(itemVariant, maxAmount, transaction); + } + + @Override + public List> getAdditionalSlots() { + return List.of(); + } + }; + var storage = context.find(FluidStorage.ITEM); + return storage != null ? storage : Storage.empty(); + } + + public static boolean fluidEquals(@NotNull Fluid fluid, @NotNull Fluid fluid1) { + return fluid == fluid1; + } + + public static boolean isContainer(ItemStack stack) { + return ContainerItemContext.withInitial(stack).find(FluidStorage.ITEM) != null; + } + + public static boolean isContainerEmpty(ItemStack stack) { + var fluidStorage = ContainerItemContext.withInitial(stack).find(FluidStorage.ITEM); + if (fluidStorage == null) return false; + + // Use current transaction in case this check is nested in a transfer operation. + try (var tx = Transaction.openNested(Transaction.getCurrentUnsafe())) { + for (var view : fluidStorage.iterable(tx)) { + if (!view.isResourceBlank() && view.getAmount() > 0) { + return false; + } + } + } + + return true; + } + + public static boolean containsMatchingFluid(ItemStack stack, Predicate predicate) { + var fluidStorage = ContainerItemContext.withInitial(stack).find(FluidStorage.ITEM); + if (fluidStorage == null) return false; + + // Use current transaction in case this check is nested in a transfer operation. + try (var tx = Transaction.openNested(Transaction.getCurrentUnsafe())) { + for (var view : fluidStorage.iterable(tx)) { + if (!view.isResourceBlank() && view.getAmount() > 0 && predicate.test(view.getResource().getFluid())) { + return true; + } + } + } + + return false; + } + + @Deprecated + public static boolean interactWithFluidHandler(PlayerEntity playerIn, Hand hand, Tank tank) { + // TODO + return false; + } + + public static String getFluidName(@NotNull FluidInstance fluidInstance) { + // TODO: use FluidVariantRendering + return getFluidName(fluidInstance.getFluid()); + } + + public static String getFluidName(@NotNull Fluid fluid) { + return StringUtils.capitalize(Registry.FLUID.getId(fluid).getPath()); + } +} diff --git a/RebornCore/src/main/java/reborncore/common/fluid/RebornFluidManager.java b/RebornCore/src/main/java/reborncore/common/fluid/RebornFluidManager.java index ce044c0c7..1dc7df24a 100644 --- a/RebornCore/src/main/java/reborncore/common/fluid/RebornFluidManager.java +++ b/RebornCore/src/main/java/reborncore/common/fluid/RebornFluidManager.java @@ -24,49 +24,21 @@ package reborncore.common.fluid; -import net.minecraft.fluid.Fluid; -import net.minecraft.item.BucketItem; -import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; -import net.minecraft.util.Lazy; import net.minecraft.util.registry.Registry; -import reborncore.common.fluid.container.ItemFluidInfo; import java.util.HashMap; -import java.util.Map; import java.util.stream.Stream; public class RebornFluidManager { private static final HashMap fluids = new HashMap<>(); - private static Lazy> bucketMap; - public static void register(RebornFluid rebornFluid, Identifier identifier) { fluids.put(identifier, rebornFluid); Registry.register(Registry.FLUID, identifier, rebornFluid); } - public static void setupBucketMap() { - bucketMap = new Lazy<>(() -> { - Map map = new HashMap<>(); - Registry.ITEM.stream().filter(item -> item instanceof BucketItem).forEach(item -> { - BucketItem bucketItem = (BucketItem) item; - //We can be sure of this as we add this via a mixin - ItemFluidInfo fluidInfo = (ItemFluidInfo) bucketItem; - Fluid fluid = fluidInfo.getFluid(new ItemStack(item)); - if (!map.containsKey(fluid)) { - map.put(fluid, bucketItem); - } - }); - return map; - }); - } - - public static Map getBucketMap() { - return bucketMap.get(); - } - public static HashMap getFluids() { return fluids; } diff --git a/RebornCore/src/main/java/reborncore/client/gui/slots/SlotFluid.java b/RebornCore/src/main/java/reborncore/common/misc/TriConsumer.java similarity index 71% rename from RebornCore/src/main/java/reborncore/client/gui/slots/SlotFluid.java rename to RebornCore/src/main/java/reborncore/common/misc/TriConsumer.java index 4fd9ff374..44a618285 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/slots/SlotFluid.java +++ b/RebornCore/src/main/java/reborncore/common/misc/TriConsumer.java @@ -22,21 +22,9 @@ * SOFTWARE. */ -package reborncore.client.gui.slots; +package reborncore.common.misc; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import reborncore.common.fluid.FluidUtil; - -public class SlotFluid extends BaseSlot { - public SlotFluid(Inventory p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_) { - super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); - } - - @Override - public boolean canInsert(ItemStack stack) { - - return FluidUtil.getFluidHandler(stack) != null; - - } -} +@FunctionalInterface +public interface TriConsumer { + void accept(A a, B b, C c); +} \ No newline at end of file diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java index 3037b70d3..9eff7fdfc 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java @@ -225,9 +225,7 @@ public class MultiblockWorldRegistry { } if (newMaster == null) { - RebornCore.LOGGER.fatal( - String.format("Multiblock system checked a merge pool of size %d, found no master candidates. This should never happen.", - mergePool.size())); + RebornCore.LOGGER.error("Multiblock system checked a merge pool of size %d, found no master candidates. This should never happen., {}", mergePool.size()); } else { // Merge all the other machines into the master machine, // then unregister them @@ -282,8 +280,7 @@ public class MultiblockWorldRegistry { // potentially dead. // Validate that they are empty/dead, then unregister them. if (!controller.isEmpty()) { - RebornCore.LOGGER.fatal( - "Found a non-empty controller. Forcing it to shed its blocks and die. This should never happen!"); + RebornCore.LOGGER.error("Found a non-empty controller. Forcing it to shed its blocks and die. This should never happen!"); detachedParts.addAll(controller.detachAllBlocks()); } diff --git a/RebornCore/src/main/java/reborncore/common/network/ClientBoundPacketHandlers.java b/RebornCore/src/main/java/reborncore/common/network/ClientBoundPacketHandlers.java index 385799aa6..8c157c583 100644 --- a/RebornCore/src/main/java/reborncore/common/network/ClientBoundPacketHandlers.java +++ b/RebornCore/src/main/java/reborncore/common/network/ClientBoundPacketHandlers.java @@ -37,8 +37,8 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import reborncore.RebornCore; import reborncore.client.ClientChunkManager; import reborncore.client.screen.builder.BuiltScreenHandler; @@ -46,13 +46,12 @@ import reborncore.common.blockentity.FluidConfiguration; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blockentity.SlotConfiguration; import reborncore.common.chunkloading.ChunkLoaderManager; -import reborncore.common.util.WorldUtils; import java.util.List; @Environment(EnvType.CLIENT) public class ClientBoundPacketHandlers { - private static final Logger LOGGER = LogManager.getLogger(); + private static final Logger LOGGER = LoggerFactory.getLogger(ClientBoundPacketHandlers.class); public static void init() { NetworkManager.registerClientBoundHandler(new Identifier("reborncore", "custom_description"), (client, handler, packetBuffer, responseSender) -> { diff --git a/RebornCore/src/main/java/reborncore/common/powerSystem/RcEnergyItem.java b/RebornCore/src/main/java/reborncore/common/powerSystem/RcEnergyItem.java index 14ceb4936..6bc5c9f12 100644 --- a/RebornCore/src/main/java/reborncore/common/powerSystem/RcEnergyItem.java +++ b/RebornCore/src/main/java/reborncore/common/powerSystem/RcEnergyItem.java @@ -1,5 +1,10 @@ package reborncore.common.powerSystem; +import net.fabricmc.fabric.api.item.v1.FabricItem; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Hand; +import reborncore.common.util.ItemUtils; import team.reborn.energy.api.base.SimpleBatteryItem; /** @@ -10,7 +15,7 @@ import team.reborn.energy.api.base.SimpleBatteryItem; * * TODO: consider moving this functionality to the energy API? */ -public interface RcEnergyItem extends SimpleBatteryItem { +public interface RcEnergyItem extends SimpleBatteryItem, FabricItem { long getEnergyCapacity(); /** @@ -25,4 +30,14 @@ public interface RcEnergyItem extends SimpleBatteryItem { default long getEnergyMaxOutput() { return getTier().getMaxOutput(); } + + @Override + default boolean allowNbtUpdateAnimation(PlayerEntity player, Hand hand, ItemStack oldStack, ItemStack newStack) { + return !ItemUtils.isEqualIgnoreEnergy(oldStack, newStack); + } + + @Override + default boolean allowContinuingBlockBreaking(PlayerEntity player, ItemStack oldStack, ItemStack newStack) { + return ItemUtils.isEqualIgnoreEnergy(oldStack, newStack); + } } diff --git a/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java b/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java index b97deb4d8..73d8b0468 100644 --- a/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java +++ b/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java @@ -38,6 +38,7 @@ import reborncore.common.powerSystem.RcEnergyItem; import reborncore.common.recipes.IRecipeInput; import team.reborn.energy.api.EnergyStorage; import team.reborn.energy.api.EnergyStorageUtil; +import team.reborn.energy.api.base.SimpleBatteryItem; import java.util.List; import java.util.function.Predicate; @@ -76,6 +77,29 @@ public class ItemUtils { return false; } + public static boolean isEqualIgnoreEnergy(ItemStack stack1, ItemStack stack2) { + if (stack1 == stack2) { + return true; + } + if (!stack1.isOf(stack2.getItem())) { + return false; + } + if (stack1.getCount() != stack2.getCount()) { + return false; + } + if (stack1.getNbt() == stack2.getNbt()) { + return true; + } + if (stack1.getNbt() == null || stack2.getNbt() == null) { + return false; + } + NbtCompound nbt1Copy = stack1.getNbt().copy(); + NbtCompound nbt2Copy = stack2.getNbt().copy(); + nbt1Copy.remove(SimpleBatteryItem.ENERGY_KEY); + nbt2Copy.remove(SimpleBatteryItem.ENERGY_KEY); + return nbt1Copy.equals(nbt2Copy); + } + //TODO tags public static boolean isInputEqual(Object input, ItemStack other, boolean matchNBT, boolean useTags) { diff --git a/RebornCore/src/main/java/reborncore/common/util/RebornInventory.java b/RebornCore/src/main/java/reborncore/common/util/RebornInventory.java index 522d90a98..ce840ee62 100644 --- a/RebornCore/src/main/java/reborncore/common/util/RebornInventory.java +++ b/RebornCore/src/main/java/reborncore/common/util/RebornInventory.java @@ -27,7 +27,6 @@ package reborncore.common.util; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.NbtCompound; -import net.minecraft.util.math.Direction; import org.jetbrains.annotations.NotNull; import reborncore.api.items.InventoryBase; import reborncore.common.blockentity.MachineBaseBlockEntity; @@ -95,12 +94,6 @@ public class RebornInventory extends Inventory return stack; } - - public RebornInventory getExternal(Direction facing) { - throw new UnsupportedOperationException("needs fixing"); - //return externalInventory.withFacing(facing); - } - public void read(NbtCompound data) { read(data, "Items"); } @@ -141,6 +134,7 @@ public class RebornInventory extends Inventory public void setHashChanged() { this.hasChanged = true; + this.markDirty(); } public void setHashChanged(boolean changed) { diff --git a/RebornCore/src/main/java/reborncore/mixin/client/MixinGameRenderer.java b/RebornCore/src/main/java/reborncore/mixin/client/MixinGameRenderer.java index a2d52166f..cd6edbee2 100644 --- a/RebornCore/src/main/java/reborncore/mixin/client/MixinGameRenderer.java +++ b/RebornCore/src/main/java/reborncore/mixin/client/MixinGameRenderer.java @@ -42,9 +42,9 @@ public class MixinGameRenderer { @Final private MinecraftClient client; - @Redirect(method = "updateMovementFovMultiplier", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;getSpeed()F")) - private float updateMovementFovMultiplier(AbstractClientPlayerEntity playerEntity) { - float playerSpeed = playerEntity.getSpeed(); + @Redirect(method = "updateFovMultiplier", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;getFovMultiplier()F")) + private float updateFovMultiplier(AbstractClientPlayerEntity playerEntity) { + float playerSpeed = playerEntity.getFovMultiplier(); for (ItemStack stack : playerEntity.getArmorItems()) { if (stack.getItem() instanceof ArmorFovHandler) { playerSpeed = ((ArmorFovHandler) stack.getItem()).changeFov(playerSpeed, stack, client.player); diff --git a/RebornCore/src/main/java/reborncore/mixin/common/MixinBucketItem.java b/RebornCore/src/main/java/reborncore/mixin/common/MixinBucketItem.java index 044d67139..da9d9a6d9 100644 --- a/RebornCore/src/main/java/reborncore/mixin/common/MixinBucketItem.java +++ b/RebornCore/src/main/java/reborncore/mixin/common/MixinBucketItem.java @@ -31,7 +31,6 @@ import net.minecraft.item.Items; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import reborncore.common.fluid.RebornFluidManager; import reborncore.common.fluid.container.ItemFluidInfo; @Mixin(BucketItem.class) @@ -48,8 +47,7 @@ public class MixinBucketItem implements ItemFluidInfo { @Override public ItemStack getFull(Fluid fluid) { - BucketItem item = RebornFluidManager.getBucketMap().get(fluid); - return new ItemStack(item); + return new ItemStack(fluid.getBucketItem()); } @Override diff --git a/RebornCore/src/main/java/reborncore/mixin/common/MixinRecipeManager.java b/RebornCore/src/main/java/reborncore/mixin/common/MixinRecipeManager.java deleted file mode 100644 index 463ca0eec..000000000 --- a/RebornCore/src/main/java/reborncore/mixin/common/MixinRecipeManager.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of RebornCore, licensed under the MIT License (MIT). - * - * Copyright (c) 2021 TeamReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package reborncore.mixin.common; - -import com.google.gson.JsonObject; -import net.minecraft.recipe.RecipeManager; -import net.minecraft.resource.ResourceManager; -import net.minecraft.util.Identifier; -import net.minecraft.util.profiler.Profiler; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import reborncore.common.crafting.ConditionManager; - -import java.util.Iterator; -import java.util.Map; - -@Mixin(RecipeManager.class) -public class MixinRecipeManager { - - @Inject(method = "apply", at = @At("HEAD")) - private void deserialize(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo info) { - Iterator> iterator = map.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = iterator.next(); - Identifier id = entry.getKey(); - JsonObject json = entry.getValue(); - - // TODO dont hard code this as its awful - if (id.getNamespace().equals("reborncore") || id.getNamespace().equals("techreborn")) { - if (!ConditionManager.shouldLoadRecipe(json)) { - iterator.remove(); - } - } - } - } -} diff --git a/RebornCore/src/main/resources/reborncore.client.mixins.json b/RebornCore/src/main/resources/reborncore.client.mixins.json index ec29fbe89..bc41afe59 100644 --- a/RebornCore/src/main/resources/reborncore.client.mixins.json +++ b/RebornCore/src/main/resources/reborncore.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "reborncore.mixin.client", - "compatibilityLevel": "JAVA_16", + "compatibilityLevel": "JAVA_17", "client": [ "MixinGameRenderer", "MixinDebugRenderer", diff --git a/RebornCore/src/main/resources/reborncore.common.mixins.json b/RebornCore/src/main/resources/reborncore.common.mixins.json index c7623bced..e32577fc9 100644 --- a/RebornCore/src/main/resources/reborncore.common.mixins.json +++ b/RebornCore/src/main/resources/reborncore.common.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "reborncore.mixin.common", - "compatibilityLevel": "JAVA_16", + "compatibilityLevel": "JAVA_17", "mixins": [ "AccessorFluidBlock", "AccessorFoliagePlacerType", @@ -14,7 +14,6 @@ "MixinItemStack", "MixinLivingEntity", "MixinPlayerEntity", - "MixinRecipeManager", "MixinServerPlayerEntity" ], "injectors": { diff --git a/build.gradle b/build.gradle index 58198e09d..fb7cb8a05 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { id 'eclipse' id 'maven-publish' id "org.cadixdev.licenser" version "0.6.1" - id "fabric-loom" version "0.10-SNAPSHOT" + id "fabric-loom" version "0.11-SNAPSHOT" id "com.matthewprenger.cursegradle" version "1.4.0" id "de.undercouch.download" version "4.1.1" } @@ -138,13 +138,6 @@ loom { } sourceSets { - // Add a generated resources directory - generated { - resources { - compiledBy("runDatagen") - } - } - // Add a data gen sourceset datagen { compileClasspath += main.compileClasspath @@ -161,8 +154,11 @@ sourceSets { } main { - runtimeClasspath += generated.runtimeClasspath - runtimeClasspath += generated.output + resources { + srcDirs += [ + 'src/main/generated' + ] + } } } @@ -206,7 +202,7 @@ loom { server() name "Data Generation" vmArg "-Dfabric-api.datagen" - vmArg "-Dfabric-api.datagen.output-dir=${file("src/generated/resources")}" + vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}" vmArg "-Dfabric-api.datagen.modid=techreborn-datagen" runDir "build/datagen" source sourceSets.datagen @@ -230,27 +226,25 @@ loom { } } } -assemble.dependsOn runDatagen test.dependsOn runGametest runDatagen { // Doesnt re-run the task when its up-to date - outputs.dir('src/generated/resources') + outputs.dir('src/main/generated') } jar { exclude "**/*.psd" - - dependsOn("runDatagen") - - from file('src/generated/resources') + from file('src/main/generated') from { crowdin.getDidWork() ? fileTree('build/translations').matching{exclude "**/en_US.json"} : null} + // A bit of a hack to allow the generated sources when they already exist + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + dependsOn 'fixTranslations' dependsOn 'runDatagen' } - task crowdinExport() { description "Triggers crowdin to export the latest translations" onlyIf { @@ -318,7 +312,7 @@ curseforge { id = "233564" changelog = ENV.CHANGELOG ?: "No changelog provided" releaseType = ENV.RELEASE_CHANNEL ?: "release" - addGameVersion "1.18" // Also update in RebornCore/build.gradle + addGameVersion "1.18.1" // Also update in RebornCore/build.gradle addGameVersion "Fabric" mainArtifact remapJar diff --git a/gradle.properties b/gradle.properties index 498988443..dd6184874 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,18 +2,18 @@ org.gradle.jvmargs=-Xmx2G # Mod properties - mod_version=5.1.0-beta.4 + mod_version=5.1.0-beta.5 # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.18 - yarn_version=1.18+build.1 - loader_version=0.12.8 - fapi_version=0.44.0+1.18 + minecraft_version=1.18.1 + yarn_version=1.18.1+build.18 + loader_version=0.12.12 + fapi_version=0.46.1+1.18 # Dependencies - energy_version=2.0.0-beta1 - rei_version=7.0.337 + energy_version=2.1.0 + rei_version=7.1.361 trinkets_version=3.0.2 autoswitch_version=-SNAPSHOT dashloader_version=2.0 diff --git a/src/datagen/groovy/techreborn/datagen/recipes/smelting/SmeltingRecipesProvider.groovy b/src/datagen/groovy/techreborn/datagen/recipes/smelting/SmeltingRecipesProvider.groovy index 8fee3e74a..c99208b28 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/smelting/SmeltingRecipesProvider.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/smelting/SmeltingRecipesProvider.groovy @@ -53,6 +53,7 @@ class SmeltingRecipesProvider extends TechRebornRecipesProvider { (CommonTags.Items.sheldoniteOres) : TRContent.Ingots.PLATINUM, (CommonTags.Items.platinumDusts) : TRContent.Ingots.PLATINUM, (Items.IRON_INGOT) : TRContent.Ingots.REFINED_IRON, + (cItem("iron_plates")): TRContent.Plates.REFINED_IRON, (CommonTags.Items.silverOres) : TRContent.Ingots.SILVER, (CommonTags.Items.rawSilverOres) : TRContent.Ingots.SILVER, (CommonTags.Items.tinOres) : TRContent.Ingots.TIN, diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 233f72deb..ef699bfce 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -33,8 +33,8 @@ import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import reborncore.common.blockentity.RedstoneConfiguration; import reborncore.common.config.Configuration; import reborncore.common.recipes.RecipeCrafter; @@ -58,7 +58,7 @@ import java.util.function.Predicate; public class TechReborn implements ModInitializer { public static final String MOD_ID = "techreborn"; - public static final Logger LOGGER = LogManager.getLogger(MOD_ID); + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); public static TechReborn INSTANCE; public static ItemGroup ITEMGROUP = FabricItemGroupBuilder.build( diff --git a/src/main/java/techreborn/api/generator/FluidGeneratorRecipe.java b/src/main/java/techreborn/api/generator/FluidGeneratorRecipe.java index ab5d5a4f3..98043170b 100644 --- a/src/main/java/techreborn/api/generator/FluidGeneratorRecipe.java +++ b/src/main/java/techreborn/api/generator/FluidGeneratorRecipe.java @@ -26,7 +26,7 @@ package techreborn.api.generator; import net.minecraft.fluid.Fluid; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; public record FluidGeneratorRecipe(Fluid fluid, int energyPerMb, EFluidGenerator generatorType) { diff --git a/src/main/java/techreborn/api/generator/FluidGeneratorRecipeList.java b/src/main/java/techreborn/api/generator/FluidGeneratorRecipeList.java index e1f57fd63..c249a8af2 100644 --- a/src/main/java/techreborn/api/generator/FluidGeneratorRecipeList.java +++ b/src/main/java/techreborn/api/generator/FluidGeneratorRecipeList.java @@ -26,7 +26,7 @@ package techreborn.api.generator; import com.google.common.collect.Sets; import net.minecraft.fluid.Fluid; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; import java.util.HashSet; import java.util.Optional; diff --git a/src/main/java/techreborn/api/recipe/recipes/FluidReplicatorRecipe.java b/src/main/java/techreborn/api/recipe/recipes/FluidReplicatorRecipe.java index 88073a9be..1009278f4 100644 --- a/src/main/java/techreborn/api/recipe/recipes/FluidReplicatorRecipe.java +++ b/src/main/java/techreborn/api/recipe/recipes/FluidReplicatorRecipe.java @@ -37,7 +37,7 @@ import reborncore.common.crafting.ingredient.RebornIngredient; import reborncore.common.fluid.container.FluidInstance; import reborncore.common.util.Tank; import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; public class FluidReplicatorRecipe extends RebornFluidRecipe { @@ -66,7 +66,7 @@ public class FluidReplicatorRecipe extends RebornFluidRecipe { return false; } final BlockPos hole = blockEntity.getPos().offset(blockEntity.getFacing().getOpposite(), 2); - final Fluid fluid = techreborn.utils.FluidUtils.fluidFromBlock(blockEntity.getWorld().getBlockState(hole).getBlock()); + final Fluid fluid = FluidUtils.fluidFromBlock(blockEntity.getWorld().getBlockState(hole).getBlock()); if (fluid == Fluids.EMPTY) { return true; } diff --git a/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java index 6e98ee517..750cbb783 100644 --- a/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java @@ -38,7 +38,6 @@ import reborncore.api.blockentity.InventoryProvider; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.fluid.FluidValue; -import reborncore.common.fluid.container.ItemFluidInfo; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; import reborncore.common.util.Tank; @@ -46,7 +45,7 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.api.generator.FluidGeneratorRecipe; import techreborn.api.generator.FluidGeneratorRecipeList; import techreborn.api.generator.GeneratorRecipeHelper; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider { @@ -89,10 +88,10 @@ public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEn if (ticksSinceLastChange >= 10) { ItemStack inputStack = inventory.getStack(0); if (!inputStack.isEmpty()) { - if (FluidUtils.isContainerEmpty(inputStack) && !tank.getFluidAmount().isEmpty()) { - FluidUtils.fillContainers(tank, inventory, 0, 1); - } else if (inputStack.getItem() instanceof ItemFluidInfo && getRecipes().getRecipeForFluid(((ItemFluidInfo) inputStack.getItem()).getFluid(inputStack)).isPresent()) { + if (FluidUtils.containsMatchingFluid(inputStack, f -> getRecipes().getRecipeForFluid(f).isPresent())) { FluidUtils.drainContainers(tank, inventory, 0, 1); + } else { + FluidUtils.fillContainers(tank, inventory, 0, 1); } } diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java index 7e86075b7..f54e7d632 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java @@ -47,7 +47,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; /** * @author drcrazy diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java index 1834502c4..75ce935c8 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java @@ -47,7 +47,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java index 1fb3a772f..2e2bc191e 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java @@ -47,7 +47,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java index fb01ce78d..909c2cddc 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java @@ -409,6 +409,7 @@ public class AutoCraftingTableBlockEntity extends PowerAcceptorBlockEntity @Override public void writeNbt(NbtCompound tag) { tag.putBoolean("locked", locked); + super.writeNbt(tag); } @Override diff --git a/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java index cbb59bb51..501f6da63 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java @@ -41,10 +41,10 @@ import techreborn.init.TRContent; public class HighVoltageSUBlockEntity extends EnergyStorageBlockEntity implements BuiltScreenHandlerProvider { /** - * MFSU should store 4M Energy with 512 E/t I/O + * MFSU should store 40M Energy with 512 E/t I/O */ public HighVoltageSUBlockEntity(BlockPos pos, BlockState state) { - super(TRBlockEntities.HIGH_VOLTAGE_SU, pos, state, "HIGH_VOLTAGE_SU", 2, TRContent.Machine.HIGH_VOLTAGE_SU.block, RcEnergyTier.HIGH, 4_000_000); + super(TRBlockEntities.HIGH_VOLTAGE_SU, pos, state, "HIGH_VOLTAGE_SU", 2, TRContent.Machine.HIGH_VOLTAGE_SU.block, RcEnergyTier.HIGH, 40_000_000); } @Override diff --git a/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java index 993f9e2fd..3fe58cf05 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java @@ -40,10 +40,10 @@ import techreborn.init.TRContent; public class MediumVoltageSUBlockEntity extends EnergyStorageBlockEntity implements BuiltScreenHandlerProvider { /** - * MFE should store 300k energy with 128 E/t I/O + * MFE should store 4M energy with 128 E/t I/O */ public MediumVoltageSUBlockEntity(BlockPos pos, BlockState state) { - super(TRBlockEntities.MEDIUM_VOLTAGE_SU, pos, state, "MEDIUM_VOLTAGE_SU", 2, TRContent.Machine.MEDIUM_VOLTAGE_SU.block, RcEnergyTier.MEDIUM, 300_000); + super(TRBlockEntities.MEDIUM_VOLTAGE_SU, pos, state, "MEDIUM_VOLTAGE_SU", 2, TRContent.Machine.MEDIUM_VOLTAGE_SU.block, RcEnergyTier.MEDIUM, 4_000_000); } @Override diff --git a/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java b/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java index 090711787..587f946be 100644 --- a/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java @@ -43,15 +43,13 @@ import reborncore.client.screen.BuiltScreenHandlerProvider; import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; -import reborncore.common.fluid.FluidUtil; import reborncore.common.fluid.FluidValue; import reborncore.common.fluid.container.FluidInstance; -import reborncore.common.util.FluidTextHelper; import reborncore.common.util.RebornInventory; import reborncore.common.util.Tank; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; import java.util.List; @@ -160,7 +158,7 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I info.add( new LiteralText(String.valueOf(this.tank.getFluidAmount())) .append(new TranslatableText("techreborn.tooltip.unit.divider")) - .append(WordUtils.capitalize(FluidUtil.getFluidName(this.tank.getFluid()))) + .append(WordUtils.capitalize(FluidUtils.getFluidName(this.tank.getFluid()))) ); } else { info.add(new TranslatableText("techreborn.tooltip.unit.empty")); diff --git a/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java b/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java index b3f9d478a..633802efe 100644 --- a/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java @@ -24,6 +24,11 @@ package techreborn.blockentity.storage.item; +import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.item.base.SingleStackStorage; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedStorage; import net.minecraft.block.BlockState; import net.minecraft.client.resource.language.I18n; import net.minecraft.entity.player.PlayerEntity; @@ -51,6 +56,7 @@ import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; import java.util.List; +import java.util.Objects; public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop, IListInfoProvider, BuiltScreenHandlerProvider { @@ -66,6 +72,8 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implement private int serverCapacity = -1; private ItemStack storeItemStack; + // Fabric transfer API support for the internal stack (one per direction); + private final SingleStackStorage[] internalStoreStorage = new SingleStackStorage[6]; private TRContent.StorageUnit type; @@ -75,23 +83,21 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implement public StorageUnitBaseBlockEntity(BlockPos pos, BlockState state) { super(TRBlockEntities.STORAGE_UNIT, pos, state); + inventory = new RebornInventory<>(2, "ItemInventory", 64, this); } public StorageUnitBaseBlockEntity(BlockPos pos, BlockState state, TRContent.StorageUnit type) { super(TRBlockEntities.STORAGE_UNIT, pos, state); + inventory = new RebornInventory<>(2, "ItemInventory", 64, this); configureEntity(type); } private void configureEntity(TRContent.StorageUnit type) { - // Set capacity to local config unless overridden by server if(serverCapacity == -1){ this.maxCapacity = type.capacity; } - storeItemStack = ItemStack.EMPTY; - inventory = new RebornInventory<>(2, "ItemInventory", 64, this); - this.type = type; } @@ -313,8 +319,6 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implement if (tagCompound.contains("lockedItem")) { lockedItemStack = ItemStack.fromNbt(tagCompound.getCompound("lockedItem")); } - - inventory.read(tagCompound); } @Override @@ -340,8 +344,6 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implement if (isLocked()) { tagCompound.put("lockedItem", lockedItemStack.writeNbt(new NbtCompound())); } - - inventory.write(tagCompound); } @Override @@ -500,4 +502,57 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implement public void setStoredStackFromNBT(NbtCompound tag) { storeItemStack = ItemStack.fromNbt(tag); } + + private Storage getInternalStoreStorage(Direction side) { + Objects.requireNonNull(side); + if (internalStoreStorage[side.getId()] == null) { + internalStoreStorage[side.getId()] = new SingleStackStorage() { + @Override + protected ItemStack getStack() { + return storeItemStack; + } + + @Override + protected void setStack(ItemStack stack) { + if (stack.isEmpty()) { + // Ensure we maintain reference equality to EMPTY + storeItemStack = ItemStack.EMPTY; + } else { + storeItemStack = stack; + } + } + + @Override + protected int getCapacity(ItemVariant itemVariant) { + // subtract capacity of output slot (super capacity is the default capacity) + return maxCapacity - super.getCapacity(itemVariant); + } + + @Override + protected boolean canInsert(ItemVariant itemVariant) { + // Check insertion with the same rules as the input slot + return StorageUnitBaseBlockEntity.this.canInsert(INPUT_SLOT, itemVariant.toStack(), side); + } + + @Override + protected boolean canExtract(ItemVariant itemVariant) { + // Check extraction with the same rules as the output slot + return StorageUnitBaseBlockEntity.this.canExtract(OUTPUT_SLOT, itemVariant.toStack(), side); + } + + @Override + protected void onFinalCommit() { + inventory.setHashChanged(); + } + }; + } + return internalStoreStorage[side.getId()]; + } + + public Storage getExposedStorage(Direction side) { + return new CombinedStorage<>(List.of( + getInternalStoreStorage(side), + InventoryStorage.of(this, side) + )); + } } diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index 191df268f..669bac048 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -24,13 +24,13 @@ package techreborn.client.gui; +import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import reborncore.client.ClientChunkManager; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonSimple; import reborncore.client.gui.builder.widget.GuiButtonUpDown; import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.client.screen.builder.BuiltScreenHandler; @@ -54,7 +54,7 @@ public class GuiChunkLoader extends GuiBase { addDrawableChild(new GuiButtonUpDown(x + 64 + 24, y + 40, this, b -> onClick(-1), UpDownButtonType.REWIND)); addDrawableChild(new GuiButtonUpDown(x + 64 + 36, y + 40, this, b -> onClick(-5), UpDownButtonType.FASTREWIND)); - addDrawableChild(new GuiButtonSimple(x + 10, y + 70, 155, 20, new LiteralText("Toggle Loaded Chunks"), b -> ClientChunkManager.toggleLoadedChunks(blockEntity.getPos()))); + addDrawableChild(new ButtonWidget(x + 10, y + 70, 155, 20, new LiteralText("Toggle Loaded Chunks"), b -> ClientChunkManager.toggleLoadedChunks(blockEntity.getPos()))); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiGreenhouseController.java b/src/main/java/techreborn/client/gui/GuiGreenhouseController.java index 90062f6d3..1e92b98c5 100644 --- a/src/main/java/techreborn/client/gui/GuiGreenhouseController.java +++ b/src/main/java/techreborn/client/gui/GuiGreenhouseController.java @@ -24,6 +24,7 @@ package techreborn.client.gui; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.resource.language.I18n; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; @@ -64,7 +65,7 @@ public class GuiGreenhouseController extends GuiBase { drawSlot(matrixStack, 48, gridYPos + 36, layer); if (!blockEntity.isMultiblockValid()) { - getMinecraft().getTextureManager().bindTexture(new Identifier("techreborn", "textures/item/part/digital_display.png")); + RenderSystem.setShaderTexture(0, new Identifier("techreborn", "textures/item/part/digital_display.png")); drawTexture(matrixStack, x + 68, y + 22, 0, 0, 16, 16, 16, 16); if (isPointInRect(68, 22, 16, 16, mouseX, mouseY)) { List list = Arrays.stream(I18n.translate("techreborn.tooltip.greenhouse.upgrade_available") diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 795dff959..ba931b32a 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -24,16 +24,14 @@ package techreborn.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.text.LiteralText; -import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonSimple; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.common.network.NetworkManager; @@ -41,12 +39,10 @@ import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity; import techreborn.packets.ServerboundPackets; import techreborn.utils.PlayerUtils; -import java.util.ArrayList; -import java.util.List; - public class GuiIronFurnace extends GuiBase { IronFurnaceBlockEntity blockEntity; + private static final Identifier EXP_BUTTON_TEXTURE = new Identifier("minecraft", "textures/item/experience_bottle.png"); public GuiIronFurnace(int syncID, PlayerEntity player, IronFurnaceBlockEntity furnace) { @@ -61,46 +57,49 @@ public class GuiIronFurnace extends GuiBase { @Override public void init() { super.init(); - addSelectableChild(new GuiButtonSimple(getGuiLeft() + 116, getGuiTop() + 57, 18, 18, LiteralText.EMPTY, b -> onClick()) { + ButtonWidget.TooltipSupplier tooltipSupplier = (button, matrices, mouseX, mouseY) -> { + PlayerEntity player = MinecraftClient.getInstance().player; + if (player == null) { return; } + String message = "Experience: "; - @Override - public void renderTooltip(MatrixStack matrixStack, int mouseX, int mouseY) { - PlayerEntity player = MinecraftClient.getInstance().player; - String message = "Experience: "; - - float furnaceExp = blockEntity.experience; - if (furnaceExp <= 0) { - message = message + "0"; + float furnaceExp = blockEntity.experience; + if (furnaceExp <= 0) { + message = message + "0"; + } else { + float expTillLevel = (1.0F - player.experienceProgress) * player.getNextLevelExperience(); + if (furnaceExp <= expTillLevel) { + int percentage = (int) (blockEntity.experience * 100 / player.getNextLevelExperience()); + message = message + "+" + + (percentage > 0 ? String.valueOf(percentage) : "<1") + + "%"; } else { - float expTillLevel = (1.0F - player.experienceProgress) * player.getNextLevelExperience(); - if (furnaceExp <= expTillLevel) { - int percentage = (int) (blockEntity.experience * 100 / player.getNextLevelExperience()); - message = message + "+" - + (percentage > 0 ? String.valueOf(percentage) : "<1") - + "%"; - } else { - int levels = 0; - furnaceExp -= expTillLevel; - while (furnaceExp > 0) { - furnaceExp -= PlayerUtils.getLevelExperience(player.experienceLevel); - ++levels; - } - message = message + "+" + levels + "L"; + int levels = 0; + furnaceExp -= expTillLevel; + while (furnaceExp > 0) { + furnaceExp -= PlayerUtils.getLevelExperience(player.experienceLevel); + ++levels; } + message = message + "+" + levels + "L"; } - - List list = new ArrayList<>(); - list.add(new LiteralText(message)); - GuiIronFurnace.this.renderTooltip(matrixStack, list, mouseX, mouseY); - RenderSystem.setShaderColor(1, 1, 1, 1); - } - @Override - protected void renderBackground(MatrixStack matrices, MinecraftClient client, int mouseX, int mouseY) { - client.getItemRenderer().renderInGuiWithOverrides(new ItemStack(Items.EXPERIENCE_BOTTLE), x, y); - } - }); + renderTooltip(matrices, new LiteralText(message), mouseX, mouseY); + }; + + addDrawableChild(new TexturedButtonWidget( + getGuiLeft() + 116, + getGuiTop() + 58, + 16, + 16, + 0, + 0, + 1, + EXP_BUTTON_TEXTURE, + 16, + 16, + b -> onClick(), + tooltipSupplier, + LiteralText.EMPTY)); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiTankUnit.java b/src/main/java/techreborn/client/gui/GuiTankUnit.java index 2a658ed40..681f083b7 100644 --- a/src/main/java/techreborn/client/gui/GuiTankUnit.java +++ b/src/main/java/techreborn/client/gui/GuiTankUnit.java @@ -29,7 +29,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.TranslatableText; import reborncore.client.gui.builder.GuiBase; import reborncore.client.screen.builder.BuiltScreenHandler; -import reborncore.common.fluid.FluidUtil; +import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.container.FluidInstance; import techreborn.blockentity.storage.fluid.TankUnitBaseBlockEntity; @@ -67,7 +67,7 @@ public class GuiTankUnit extends GuiBase { textRenderer.draw(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752); } else { textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.tank.type"), 10, 20, 4210752); - textRenderer.draw(matrixStack, FluidUtil.getFluidName(fluid).replace("_", " "), 10, 30, 4210752); + textRenderer.draw(matrixStack, FluidUtils.getFluidName(fluid).replace("_", " "), 10, 30, 4210752); textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.tank.amount"), 10, 50, 4210752); diff --git a/src/main/java/techreborn/config/TechRebornConfig.java b/src/main/java/techreborn/config/TechRebornConfig.java index 4180f4346..ebdc917ba 100644 --- a/src/main/java/techreborn/config/TechRebornConfig.java +++ b/src/main/java/techreborn/config/TechRebornConfig.java @@ -301,10 +301,10 @@ public class TechRebornConfig { @Config(config = "items", category = "power", key = "quantumSuitDamageAbsorbCost", comment = "Quantum Suit Cost for Damage Absorbed") public static double damageAbsorbCost = 10; - @Config(config = "items", category = "upgrades", key = "overclcoker_speed", comment = "Overclocker behavior speed multipiler") + @Config(config = "items", category = "upgrades", key = "overclocker_speed", comment = "Overclocker behavior speed multiplier") public static double overclockerSpeed = 0.25; - @Config(config = "items", category = "upgrades", key = "overclcoker_power", comment = "Overclocker behavior power multipiler") + @Config(config = "items", category = "upgrades", key = "overclocker_power", comment = "Overclocker behavior power multiplier") public static double overclockerPower = 0.75; @Config(config = "items", category = "upgrades", key = "energy_storage", comment = "Energy storage behavior extra power") diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index db6af8b00..4bd2c961b 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -25,18 +25,19 @@ package techreborn.events; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage; import net.minecraft.block.*; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; import net.minecraft.item.Items; -import net.minecraft.item.ToolMaterials; import net.minecraft.sound.BlockSoundGroup; import reborncore.RebornRegistry; import reborncore.common.powerSystem.RcEnergyTier; import team.reborn.energy.api.EnergyStorage; import techreborn.TechReborn; import techreborn.blockentity.cable.CableBlockEntity; +import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity; import techreborn.blocks.misc.*; import techreborn.config.TechRebornConfig; import techreborn.init.*; @@ -172,6 +173,16 @@ public class ModRegistry { RebornRegistry.registerItem(TRContent.PERIDOT_LEGGINGS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.PERIDOT, EquipmentSlot.LEGS), "peridot_leggings")); RebornRegistry.registerItem(TRContent.PERIDOT_BOOTS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.PERIDOT, EquipmentSlot.FEET), "peridot_boots")); + RebornRegistry.registerItem(TRContent.SILVER_HELMET = InitUtils.setup(new TRArmourItem(TRArmorMaterials.SILVER, EquipmentSlot.HEAD), "silver_helmet")); + RebornRegistry.registerItem(TRContent.SILVER_CHESTPLATE = InitUtils.setup(new TRArmourItem(TRArmorMaterials.SILVER, EquipmentSlot.CHEST), "silver_chestplate")); + RebornRegistry.registerItem(TRContent.SILVER_LEGGINGS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.SILVER, EquipmentSlot.LEGS), "silver_leggings")); + RebornRegistry.registerItem(TRContent.SILVER_BOOTS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.SILVER, EquipmentSlot.FEET), "silver_boots")); + + RebornRegistry.registerItem(TRContent.STEEL_HELMET = InitUtils.setup(new TRArmourItem(TRArmorMaterials.STEEL, EquipmentSlot.HEAD), "steel_helmet")); + RebornRegistry.registerItem(TRContent.STEEL_CHESTPLATE = InitUtils.setup(new TRArmourItem(TRArmorMaterials.STEEL, EquipmentSlot.CHEST), "steel_chestplate")); + RebornRegistry.registerItem(TRContent.STEEL_LEGGINGS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.STEEL, EquipmentSlot.LEGS), "steel_leggings")); + RebornRegistry.registerItem(TRContent.STEEL_BOOTS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.STEEL, EquipmentSlot.FEET), "steel_boots")); + // Battery RebornRegistry.registerItem(TRContent.RED_CELL_BATTERY = InitUtils.setup(new BatteryItem(TechRebornConfig.redCellBatteryMaxCharge, RcEnergyTier.LOW), "red_cell_battery")); RebornRegistry.registerItem(TRContent.LITHIUM_ION_BATTERY = InitUtils.setup(new BatteryItem(TechRebornConfig.lithiumIonBatteryMaxCharge, RcEnergyTier.MEDIUM), "lithium_ion_battery")); @@ -211,6 +222,7 @@ public class ModRegistry { RebornRegistry.registerItem(TRContent.MANUAL = InitUtils.setup(new ManualItem(), "manual")); RebornRegistry.registerItem(TRContent.DEBUG_TOOL = InitUtils.setup(new DebugToolItem(), "debug_tool")); RebornRegistry.registerItem(TRContent.CELL = InitUtils.setup(new DynamicCellItem(), "cell")); + TRContent.CELL.registerFluidApi(); TechReborn.LOGGER.debug("TechReborns Items Loaded"); } @@ -232,6 +244,7 @@ public class ModRegistry { } private static void registerApis() { - EnergyStorage.SIDED.registerForBlockEntities((be, direction) -> ((CableBlockEntity) be).getSideEnergyStorage(direction), TRBlockEntities.CABLE); + EnergyStorage.SIDED.registerForBlockEntity(CableBlockEntity::getSideEnergyStorage, TRBlockEntities.CABLE); + ItemStorage.SIDED.registerForBlockEntity(StorageUnitBaseBlockEntity::getExposedStorage, TRBlockEntities.STORAGE_UNIT); } } diff --git a/src/main/java/techreborn/events/StackToolTipHandler.java b/src/main/java/techreborn/events/StackToolTipHandler.java index f39638334..28181188b 100644 --- a/src/main/java/techreborn/events/StackToolTipHandler.java +++ b/src/main/java/techreborn/events/StackToolTipHandler.java @@ -24,12 +24,16 @@ package techreborn.events; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback; import net.minecraft.block.Block; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.item.TooltipContext; +import net.minecraft.fluid.FlowableFluid; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.integrated.IntegratedServer; @@ -44,6 +48,7 @@ import net.minecraft.world.gen.HeightContext; import org.jetbrains.annotations.Nullable; import reborncore.common.BaseBlockEntityProvider; import techreborn.init.TRContent; +import techreborn.items.DynamicCellItem; import techreborn.items.UpgradeItem; import techreborn.utils.ToolTipAssistUtils; import techreborn.world.OreDistribution; @@ -56,12 +61,18 @@ public class StackToolTipHandler implements ItemTooltipCallback { public static final Map ITEM_ID = Maps.newHashMap(); private static final Map ORE_DISTRIBUTION_MAP = Maps.newHashMap(); + private static final List UNOBTAINABLE_ORES = Lists.newLinkedList(); public static void setup() { ItemTooltipCallback.EVENT.register(new StackToolTipHandler()); for (TRContent.Ores ore : TRContent.Ores.values()) { - if (ore.isDeepslate()) continue; + if (ore.isDeepslate()) { + TRContent.Ores normal = ore.getUnDeepslate(); + if (normal.distribution != null && normal.distribution.dimension != TargetDimension.OVERWORLD) + UNOBTAINABLE_ORES.add(ore.block); + continue; + } if (ore.distribution != null) { ORE_DISTRIBUTION_MAP.put(ore.block, ore.distribution); @@ -103,18 +114,25 @@ public class StackToolTipHandler implements ItemTooltipCallback { tooltipLines.addAll(ToolTipAssistUtils.getUpgradeStats(TRContent.Upgrades.valueOf(upgrade.name.toUpperCase()), stack.getCount(), Screen.hasShiftDown())); } - OreDistribution oreDistribution = ORE_DISTRIBUTION_MAP.get(block); + if (item instanceof DynamicCellItem cell) { + Fluid fluid = cell.getFluid(stack); + if (!(fluid instanceof FlowableFluid) && fluid != Fluids.EMPTY) + ToolTipAssistUtils.addInfo("unplaceable_fluid", tooltipLines, false); + } - if (oreDistribution != null) { - Text text = switch (oreDistribution.dimension) { + Text text = null; + if (UNOBTAINABLE_ORES.contains(block)) + text = new TranslatableText("techreborn.tooltip.unobtainable"); + OreDistribution oreDistribution = ORE_DISTRIBUTION_MAP.get(block); + if (oreDistribution != null && text == null) { + text = switch (oreDistribution.dimension) { case OVERWORLD -> getOverworldOreText(oreDistribution); case END -> new TranslatableText("techreborn.tooltip.ores.end"); case NETHER -> new TranslatableText("techreborn.tooltip.ores.nether"); }; - - if (text != null) - tooltipLines.add(text.copy().formatted(Formatting.AQUA)); } + if (text != null) + tooltipLines.add(text.copy().formatted(Formatting.AQUA)); } private static boolean isTRItem(Item item) { diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 56719c629..3deb71270 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -84,11 +84,12 @@ public enum ModFluids { this.identifier = new Identifier(TechReborn.MOD_ID, this.toString().toLowerCase(Locale.ROOT)); FluidSettings fluidSettings = FluidSettings.create(); + + Identifier texture_still = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase(Locale.ROOT) + "_still"); + Identifier texture_flowing = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase(Locale.ROOT) + "_flowing"); - Identifier texture = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase(Locale.ROOT) + "_flowing"); - - fluidSettings.setStillTexture(texture); - fluidSettings.setFlowingTexture(texture); + fluidSettings.setStillTexture(texture_still); + fluidSettings.setFlowingTexture(texture_flowing); stillFluid = new RebornFluid(true, fluidSettings, () -> block, () -> bucket, () -> flowingFluid, () -> stillFluid) { }; diff --git a/src/main/java/techreborn/init/TRArmorMaterials.java b/src/main/java/techreborn/init/TRArmorMaterials.java index 674fef470..e28a40ee1 100644 --- a/src/main/java/techreborn/init/TRArmorMaterials.java +++ b/src/main/java/techreborn/init/TRArmorMaterials.java @@ -49,6 +49,12 @@ public enum TRArmorMaterials implements ArmorMaterial { PERIDOT(17, new int[]{3, 8, 3, 2}, 16, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.0F, () -> { return Ingredient.ofItems(TRContent.Gems.PERIDOT.asItem()); }), + SILVER(14, new int[]{1, 3, 5, 2}, 20, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, () -> { + return Ingredient.ofItems(TRContent.Ingots.SILVER.asItem()); + }), + STEEL(24, new int[]{3, 5, 6, 2}, 5, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 1.75F, 0.1F, () -> { + return Ingredient.ofItems(TRContent.Ingots.STEEL.asItem()); + }), QUANTUM(75, new int[]{3, 6, 8, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.0F, () -> Ingredient.EMPTY), CLOAKING_DEVICE(5, new int[]{0, 2, 0, 0}, 0, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, () -> Ingredient.EMPTY), LITHIUM_BATPACK(25, new int[]{0, 5, 0, 0}, 10, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, () -> Ingredient.EMPTY), @@ -60,18 +66,25 @@ public enum TRArmorMaterials implements ArmorMaterial { private final int enchantability; private final SoundEvent soundEvent; private final float toughness; + private final float knockbackResistance; private final Lazy repairMaterial; TRArmorMaterials(int maxDamageFactor, int[] damageReductionAmountArray, int enchantability, - SoundEvent soundEvent, float toughness, Supplier repairMaterialIn) { + SoundEvent soundEvent, float toughness, float knockbackResistance, Supplier repairMaterialIn) { this.maxDamageFactor = maxDamageFactor; this.damageReductionAmountArray = damageReductionAmountArray; this.enchantability = enchantability; this.soundEvent = soundEvent; this.toughness = toughness; + this.knockbackResistance = knockbackResistance; this.repairMaterial = new Lazy<>(repairMaterialIn); } + TRArmorMaterials(int maxDamageFactor, int[] damageReductionAmountArray, int enchantability, + SoundEvent soundEvent, float toughness, Supplier repairMaterialIn) { + this(maxDamageFactor, damageReductionAmountArray, enchantability, soundEvent, toughness, 0.0F, repairMaterialIn); + } + @Override public int getDurability(EquipmentSlot slotIn) { return MAX_DAMAGE_ARRAY[slotIn.getEntitySlotId()] * maxDamageFactor; @@ -109,6 +122,6 @@ public enum TRArmorMaterials implements ArmorMaterial { @Override public float getKnockbackResistance() { - return 0; //Knockback resitance + return knockbackResistance; } } diff --git a/src/main/java/techreborn/init/TRCauldronBehavior.java b/src/main/java/techreborn/init/TRCauldronBehavior.java index 7c0c2b838..a8c45a4a6 100644 --- a/src/main/java/techreborn/init/TRCauldronBehavior.java +++ b/src/main/java/techreborn/init/TRCauldronBehavior.java @@ -43,7 +43,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.event.GameEvent; import techreborn.items.DynamicCellItem; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; public class TRCauldronBehavior { public static void init() { diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index dcb4e8b4e..17c258587 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -231,6 +231,22 @@ public class TRContent { public static Item PERIDOT_LEGGINGS; @Nullable public static Item PERIDOT_BOOTS; + @Nullable + public static Item SILVER_HELMET; + @Nullable + public static Item SILVER_CHESTPLATE; + @Nullable + public static Item SILVER_LEGGINGS; + @Nullable + public static Item SILVER_BOOTS; + @Nullable + public static Item STEEL_HELMET; + @Nullable + public static Item STEEL_CHESTPLATE; + @Nullable + public static Item STEEL_LEGGINGS; + @Nullable + public static Item STEEL_BOOTS; public enum SolarPanels implements ItemConvertible { BASIC(RcEnergyTier.MICRO, TechRebornConfig.basicGenerationRateD, TechRebornConfig.basicGenerationRateN), @@ -373,6 +389,8 @@ public class TRContent { private final static Map deepslateMap = new HashMap<>(); + private final static Map unDeepslateMap = new HashMap<>(); + public enum Ores implements ItemConvertible { // when changing ores also change data/techreborn/tags/items/ores.json for correct root advancement display // as well as data/minecraft/tags/blocks for correct mining level @@ -424,6 +442,7 @@ public class TRContent { Ores(TRContent.Ores stoneOre) { this((OreDistribution) null); deepslateMap.put(stoneOre, this); + unDeepslateMap.put(this, stoneOre); } @Override @@ -436,6 +455,11 @@ public class TRContent { return deepslateMap.get(this); } + public TRContent.Ores getUnDeepslate() { + Preconditions.checkArgument(isDeepslate()); + return unDeepslateMap.get(this); + } + public boolean isDeepslate() { return name.startsWith("deepslate_"); } @@ -600,7 +624,7 @@ public class TRContent { } public enum Dusts implements ItemConvertible { - ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME, + ALMANDINE, ALUMINUM, AMETHYST, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME, CINNABAR, CLAY, COAL, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE, FLINT, GALENA, GRANITE, GROSSULAR, INVAR, LAZURITE, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK, NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, QUARTZ, RED_GARNET, RUBY, SALTPETER, @@ -809,6 +833,7 @@ public class TRContent { UU_MATTER, PLANTBALL, COMPRESSED_PLANTBALL, + SPONGE_PIECE, SYNTHETIC_REDSTONE_CRYSTAL; diff --git a/src/main/java/techreborn/init/TRToolMaterials.java b/src/main/java/techreborn/init/TRToolMaterials.java index bf3764a46..614bf4198 100644 --- a/src/main/java/techreborn/init/TRToolMaterials.java +++ b/src/main/java/techreborn/init/TRToolMaterials.java @@ -1,3 +1,27 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2020 TechReborn + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package techreborn.init; import net.minecraft.item.ToolMaterial; diff --git a/src/main/java/techreborn/items/DynamicCellItem.java b/src/main/java/techreborn/items/DynamicCellItem.java index c56dce523..b989f1626 100644 --- a/src/main/java/techreborn/items/DynamicCellItem.java +++ b/src/main/java/techreborn/items/DynamicCellItem.java @@ -24,6 +24,13 @@ package techreborn.items; +import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleVariantItemStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; import net.minecraft.block.BlockState; import net.minecraft.block.FluidDrainable; import net.minecraft.block.FluidFillable; @@ -60,12 +67,11 @@ import net.minecraft.world.event.GameEvent; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.text.WordUtils; import org.jetbrains.annotations.Nullable; -import reborncore.common.fluid.FluidUtil; import reborncore.common.fluid.container.ItemFluidInfo; import reborncore.common.util.ItemNBTHelper; import techreborn.TechReborn; import techreborn.init.TRContent; -import techreborn.utils.FluidUtils; +import reborncore.common.fluid.FluidUtils; /** * Created by modmuss50 on 17/05/2016. @@ -160,7 +166,7 @@ public class DynamicCellItem extends Item implements ItemFluidInfo { Fluid fluid = getFluid(itemStack); if (fluid != Fluids.EMPTY) { //TODO use translation keys for fluid and the cell https://fabric.asie.pl/wiki/tutorial:lang?s[]=translation might be useful - return new LiteralText(WordUtils.capitalizeFully(FluidUtil.getFluidName(fluid).replaceAll("_", " ")) + " Cell"); + return new LiteralText(WordUtils.capitalizeFully(FluidUtils.getFluidName(fluid).replaceAll("_", " ")) + " Cell"); } return super.getName(itemStack); } @@ -171,7 +177,7 @@ public class DynamicCellItem extends Item implements ItemFluidInfo { Fluid containedFluid = getFluid(stack); BlockHitResult hitResult = raycast(world, player, containedFluid == Fluids.EMPTY ? RaycastContext.FluidHandling.SOURCE_ONLY : RaycastContext.FluidHandling.NONE); - if (hitResult.getType() == HitResult.Type.MISS) { + if (hitResult.getType() == HitResult.Type.MISS || !(containedFluid instanceof FlowableFluid || Fluids.EMPTY == containedFluid)) { return TypedActionResult.pass(stack); } if (hitResult.getType() != HitResult.Type.BLOCK) { @@ -238,10 +244,75 @@ public class DynamicCellItem extends Item implements ItemFluidInfo { @Override public Fluid getFluid(ItemStack itemStack) { - NbtCompound tag = itemStack.getNbt(); + return getFluid(itemStack.getNbt()); + } + + private Fluid getFluid(@Nullable NbtCompound tag) { if (tag != null && tag.contains("fluid")) { return Registry.FLUID.get(new Identifier(tag.getString("fluid"))); } return Fluids.EMPTY; } + + public void registerFluidApi() { + FluidStorage.ITEM.registerForItems((stack, ctx) -> new CellStorage(ctx), this); + } + + public class CellStorage extends SingleVariantItemStorage { + public CellStorage(ContainerItemContext context) { + super(context); + } + + @Override + protected FluidVariant getBlankResource() { + return FluidVariant.blank(); + } + + @Override + protected FluidVariant getResource(ItemVariant currentVariant) { + return FluidVariant.of(getFluid(currentVariant.getNbt())); + } + + @Override + protected long getAmount(ItemVariant currentVariant) { + return getResource(currentVariant).isBlank() ? 0 : FluidConstants.BUCKET; + } + + @Override + protected long getCapacity(FluidVariant variant) { + return FluidConstants.BUCKET; + } + + @Override + protected ItemVariant getUpdatedVariant(ItemVariant currentVariant, FluidVariant newResource, long newAmount) { + if (newAmount != 0 && newAmount != FluidConstants.BUCKET) { + throw new IllegalArgumentException("Only amounts of 0 and 1 bucket are supported! This is a bug!"); + } + // TODO: this is not ideal since we delete any extra NBT, but it probably doesn't matter in practice? + if (newResource.isBlank() || newAmount == 0) { + return ItemVariant.of(DynamicCellItem.this); + } else { + return ItemVariant.of(getCellWithFluid(newResource.getFluid())); + } + } + + // A few "hacks" to ensure that transfer is always exactly 0 or 1 bucket. + @Override + public long insert(FluidVariant insertedResource, long maxAmount, TransactionContext transaction) { + if (isResourceBlank() && maxAmount >= FluidConstants.BUCKET) { + return super.insert(insertedResource, FluidConstants.BUCKET, transaction); + } else { + return 0; + } + } + + @Override + public long extract(FluidVariant extractedResource, long maxAmount, TransactionContext transaction) { + if (!isResourceBlank() && maxAmount >= FluidConstants.BUCKET) { + return super.extract(extractedResource, FluidConstants.BUCKET, transaction); + } else { + return 0; + } + } + } } diff --git a/src/main/java/techreborn/items/tool/DrillItem.java b/src/main/java/techreborn/items/tool/DrillItem.java index 5f714e36a..edcf13da8 100644 --- a/src/main/java/techreborn/items/tool/DrillItem.java +++ b/src/main/java/techreborn/items/tool/DrillItem.java @@ -35,7 +35,6 @@ import net.minecraft.tag.Tag; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.RcEnergyItem; import reborncore.common.powerSystem.RcEnergyTier; import reborncore.common.util.ItemUtils; @@ -95,7 +94,7 @@ public class DrillItem extends PickaxeItem implements RcEnergyItem, DynamicAttri if (Items.DIAMOND_SHOVEL.getMiningSpeedMultiplier(new ItemStack(Items.DIAMOND_SHOVEL), blockIn) > 1.0f) { return true; } - return Items.DIAMOND_PICKAXE.getMiningSpeedMultiplier(new ItemStack(Items.DIAMOND_SHOVEL), blockIn) > 1.0f; + return Items.DIAMOND_PICKAXE.getMiningSpeedMultiplier(new ItemStack(Items.DIAMOND_PICKAXE), blockIn) > 1.0f; } // MiningToolItem diff --git a/src/main/java/techreborn/items/tool/basic/RockCutterItem.java b/src/main/java/techreborn/items/tool/basic/RockCutterItem.java index c764df0e5..29cfbaef9 100644 --- a/src/main/java/techreborn/items/tool/basic/RockCutterItem.java +++ b/src/main/java/techreborn/items/tool/basic/RockCutterItem.java @@ -35,7 +35,6 @@ import net.minecraft.item.*; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.RcEnergyItem; import reborncore.common.util.ItemUtils; import reborncore.common.powerSystem.RcEnergyTier; @@ -54,7 +53,7 @@ public class RockCutterItem extends PickaxeItem implements RcEnergyItem { // 10k Energy with 128 E\t charge rate public RockCutterItem() { // combat stats same as for diamond pickaxe. Fix for #2468 - super(TRToolMaterials.ROCK_CUTTER, 1, -2.8F, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1)); + super(TRToolMaterials.ROCK_CUTTER, 1, -2.8f, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1)); } // PickaxeItem @@ -66,7 +65,7 @@ public class RockCutterItem extends PickaxeItem implements RcEnergyItem { @Override public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { if (getStoredEnergy(stack) < cost) { - return 2F; + return 1.0f; } else { return Items.DIAMOND_PICKAXE.getMiningSpeedMultiplier(stack, state); } diff --git a/src/main/java/techreborn/utils/FluidUtils.java b/src/main/java/techreborn/utils/FluidUtils.java deleted file mode 100644 index 3d2adf4f1..000000000 --- a/src/main/java/techreborn/utils/FluidUtils.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2020 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.utils; - -import net.minecraft.block.Block; -import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.Fluids; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.registry.Registry; -import org.jetbrains.annotations.NotNull; -import reborncore.common.fluid.FluidValue; -import reborncore.common.fluid.container.FluidInstance; -import reborncore.common.fluid.container.ItemFluidInfo; -import reborncore.common.util.Tank; -import reborncore.mixin.common.AccessorFluidBlock; - -import java.util.List; -import java.util.stream.Collectors; - -public class FluidUtils { - - @NotNull - public static Fluid fluidFromBlock(Block block) { - if (block instanceof AccessorFluidBlock) { - return ((AccessorFluidBlock) block).getFluid(); - } - return Fluids.EMPTY; - } - - public static List getAllFluids() { - return Registry.FLUID.stream().collect(Collectors.toList()); - } - - public static boolean drainContainers(Tank tank, Inventory inventory, int inputSlot, int outputSlot) { - return drainContainers(tank, inventory, inputSlot, outputSlot, false); - } - - public static boolean drainContainers(Tank tank, Inventory inventory, int inputSlot, int outputSlot, boolean voidFluid) { - ItemStack inputStack = inventory.getStack(inputSlot); - ItemStack outputStack = inventory.getStack(outputSlot); - - if (inputStack.isEmpty()) return false; - if (!(inputStack.getItem() instanceof ItemFluidInfo itemFluidInfo)) return false; - if (FluidUtils.isContainerEmpty(inputStack)) return false; - if (outputStack.getCount() >= outputStack.getMaxCount()) return false; - if (!outputStack.isEmpty() && !FluidUtils.isContainerEmpty(outputStack)) return false; - - if (!outputStack.isEmpty() && !outputStack.isItemEqual(itemFluidInfo.getEmpty())) return false; - - FluidInstance tankFluidInstance = tank.getFluidInstance(); - Fluid tankFluid = tankFluidInstance.getFluid(); - - if (tankFluidInstance.isEmpty() || tankFluid == itemFluidInfo.getFluid(inputStack)) { - FluidValue freeSpace = tank.getFluidValueCapacity().subtract(tankFluidInstance.getAmount()); - - if (freeSpace.equalOrMoreThan(FluidValue.BUCKET) || voidFluid) { - inputStack.decrement(1); - if (!voidFluid) { - tankFluidInstance.setFluid(itemFluidInfo.getFluid(inputStack)); - tankFluidInstance.addAmount(FluidValue.BUCKET); - } - if (outputStack.isEmpty()) { - inventory.setStack(outputSlot, itemFluidInfo.getEmpty()); - } else { - outputStack.increment(1); - } - } - } - - return true; - } - - public static boolean fillContainers(Tank source, Inventory inventory, int inputSlot, int outputSlot) { - ItemStack inputStack = inventory.getStack(inputSlot); - ItemStack outputStack = inventory.getStack(outputSlot); - - if (!FluidUtils.isContainerEmpty(inputStack)) return false; - ItemFluidInfo itemFluidInfo = (ItemFluidInfo) inputStack.getItem(); - FluidInstance sourceFluid = source.getFluidInstance(); - - if (sourceFluid.getFluid() == Fluids.EMPTY || sourceFluid.getAmount().lessThan(FluidValue.BUCKET)) { - return false; - } - - if (!outputStack.isEmpty()) { - if (outputStack.getCount() >= outputStack.getMaxCount()) return false; - if (!(outputStack.getItem() instanceof ItemFluidInfo outputFluidInfo)) return false; - if (!outputStack.isItemEqual(itemFluidInfo.getEmpty())) return false; - - if (outputFluidInfo.getFluid(outputStack) != sourceFluid.getFluid()) { - return false; - } - } - - if (outputStack.isEmpty()) { - inventory.setStack(outputSlot, itemFluidInfo.getFull(sourceFluid.getFluid())); - } else { - outputStack.increment(1); - } - - sourceFluid.subtractAmount(FluidValue.BUCKET); - inputStack.decrement(1); - - return true; - } - - public static boolean fluidEquals(@NotNull Fluid fluid, @NotNull Fluid fluid1) { - return fluid == fluid1; - } - - public static boolean isContainerEmpty(ItemStack stack) { - if (stack.isEmpty()) - return false; - if (stack.getItem() instanceof ItemFluidInfo itemFluidInfo) - return itemFluidInfo.getFluid(stack) == Fluids.EMPTY; - - return false; - } -} diff --git a/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png new file mode 100644 index 000000000..d567ae3df Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png new file mode 100644 index 000000000..dfd57943a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/steel_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/steel_layer_1.png new file mode 100644 index 000000000..267f7023f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/steel_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/steel_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/steel_layer_2.png new file mode 100644 index 000000000..7f719ec3b Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/steel_layer_2.png differ diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index a367fd453..e07304ac0 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -377,6 +377,7 @@ "_comment7": "Dusts", "item.techreborn.almandine_dust": "Almandine Dust", "item.techreborn.aluminum_dust": "Aluminium Dust", + "item.techreborn.amethyst_dust": "Amethyst Dust", "item.techreborn.andesite_dust": "Andesite Dust", "item.techreborn.andradite_dust": "Andradite Dust", "item.techreborn.ashes_dust": "Ashes", @@ -638,6 +639,7 @@ "item.techreborn.uu_matter": "UU-Matter", "item.techreborn.plantball": "Plantball", "item.techreborn.compressed_plantball": "Compressed Plantball", + "item.techreborn.sponge_piece": "Piece of Sponge", "item.techreborn.synthetic_redstone_crystal": "Synthetic Redstone Crystal", "_comment14": "Items-Armor", @@ -728,6 +730,16 @@ "item.techreborn.peridot_leggings": "Peridot Leggings", "item.techreborn.peridot_boots": "Peridot Boots", + "item.techreborn.silver_helmet": "Silver Helmet", + "item.techreborn.silver_chestplate": "Silver Chestplate", + "item.techreborn.silver_leggings": "Silver Leggings", + "item.techreborn.silver_boots": "Silver Boots", + + "item.techreborn.steel_helmet": "Steel Helmet", + "item.techreborn.steel_chestplate": "Steel Chestplate", + "item.techreborn.steel_leggings": "Steel Leggings", + "item.techreborn.steel_boots": "Steel Boots", + "_comment18": "Message", "techreborn.message.missingmultiblock": "Incomplete Multiblock", "techreborn.message.setTo": "Set to", @@ -747,6 +759,8 @@ "techreborn.message.info.item.techreborn.energy_storage_upgrade": "Increase energy store", "techreborn.message.info.item.techreborn.superconductor_upgrade": "Increases energy flow rate", + "techreborn.message.info.unplaceable_fluid": "Cannot be placed", + "techreborn.message.info.block.techreborn.basic_solar_panel": "Produce energy from sunlight", "techreborn.message.info.block.techreborn.advanced_solar_panel": "Produce energy from sunlight", "techreborn.message.info.block.techreborn.industrial_solar_panel": "Produce energy from sunlight", @@ -870,6 +884,7 @@ "techreborn.tooltip.ores.overworld" : "Can be found at y levels %s < %s", "techreborn.tooltip.ores.nether" : "Can be found in the nether", "techreborn.tooltip.ores.end" : "Can be found in the end", + "techreborn.tooltip.unobtainable": "Unobtainable in Survival Mode", "_comment23": "ManualUI", "techreborn.manual.wiki": "Online wiki", diff --git a/src/main/resources/assets/techreborn/models/block/fluid/beryllium.json b/src/main/resources/assets/techreborn/models/block/fluid/beryllium.json index 84e5c7b29..2d6c5dab2 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/beryllium.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/beryllium.json @@ -1,5 +1,6 @@ -{ +{ "textures": { - "particle": "techreborn:block/fluids/beryllium_flowing" + "particle": "techreborn:block/fluids/beryllium_still" } } + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/biofuel.json b/src/main/resources/assets/techreborn/models/block/fluid/biofuel.json index 7223f8ea4..83002fb17 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/biofuel.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/biofuel.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/biofuel_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/biofuel_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/calcium.json b/src/main/resources/assets/techreborn/models/block/fluid/calcium.json index 2eab81fc0..3bb63e3f7 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/calcium.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/calcium.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/calcium_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/calcium_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/calcium_carbonate.json b/src/main/resources/assets/techreborn/models/block/fluid/calcium_carbonate.json index 50cea32b9..be654f02e 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/calcium_carbonate.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/calcium_carbonate.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/calcium_carbonate_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/calcium_carbonate_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/carbon.json b/src/main/resources/assets/techreborn/models/block/fluid/carbon.json index a78e9dd6e..1f17e8af0 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/carbon.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/carbon.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/carbon_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/carbon_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/carbon_fiber.json b/src/main/resources/assets/techreborn/models/block/fluid/carbon_fiber.json index 66394bd4a..232ba537e 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/carbon_fiber.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/carbon_fiber.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/carbon_fiber_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/carbon_fiber_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/chlorite.json b/src/main/resources/assets/techreborn/models/block/fluid/chlorite.json index 5776557d0..8360d4966 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/chlorite.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/chlorite.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/chlorite_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/chlorite_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/compressed_air.json b/src/main/resources/assets/techreborn/models/block/fluid/compressed_air.json index 485c34edb..10c8b10a7 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/compressed_air.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/compressed_air.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/compressed_air_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/compressed_air_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/deuterium.json b/src/main/resources/assets/techreborn/models/block/fluid/deuterium.json index aeff570d7..4da8f9b7a 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/deuterium.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/deuterium.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/deuterium_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/deuterium_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/diesel.json b/src/main/resources/assets/techreborn/models/block/fluid/diesel.json index d48317945..98e124a7c 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/diesel.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/diesel.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/diesel_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/diesel_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/electrolyzed_water.json b/src/main/resources/assets/techreborn/models/block/fluid/electrolyzed_water.json index 42fac9b0a..8a5b232a6 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/electrolyzed_water.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/electrolyzed_water.json @@ -1,5 +1,6 @@ -{ +{ "textures": { - "particle": "techreborn:block/fluids/electrolyzed_water_flowing" + "particle": "techreborn:block/fluids/electrolyzed_water_still" } } + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/glyceryl.json b/src/main/resources/assets/techreborn/models/block/fluid/glyceryl.json index e1d70da99..9fed63ade 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/glyceryl.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/glyceryl.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/glyceryl_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/glyceryl_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/helium.json b/src/main/resources/assets/techreborn/models/block/fluid/helium.json index 7309b983f..8e14cd063 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/helium.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/helium.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/helium_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/helium_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/helium3.json b/src/main/resources/assets/techreborn/models/block/fluid/helium3.json index 80e875e5c..ddccf5334 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/helium3.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/helium3.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/helium3_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/helium3_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/heliumplasma.json b/src/main/resources/assets/techreborn/models/block/fluid/heliumplasma.json index 88142002b..6ee49f0e2 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/heliumplasma.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/heliumplasma.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/heliumplasma_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/heliumplasma_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/hydrogen.json b/src/main/resources/assets/techreborn/models/block/fluid/hydrogen.json index 4599fb515..ec95cde86 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/hydrogen.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/hydrogen.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/hydrogen_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/hydrogen_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/lithium.json b/src/main/resources/assets/techreborn/models/block/fluid/lithium.json index 884ee114c..7b218d2e3 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/lithium.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/lithium.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/lithium_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/lithium_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/mercury.json b/src/main/resources/assets/techreborn/models/block/fluid/mercury.json index 3d1fe5e79..8afeed963 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/mercury.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/mercury.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/mercury_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/mercury_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/methane.json b/src/main/resources/assets/techreborn/models/block/fluid/methane.json index 21655ec7d..95f711938 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/methane.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/methane.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/methane_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/methane_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitro_carbon.json b/src/main/resources/assets/techreborn/models/block/fluid/nitro_carbon.json index dc3bffe71..7a8517e50 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitro_carbon.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitro_carbon.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitro_carbon_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/nitro_carbon_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitro_diesel.json b/src/main/resources/assets/techreborn/models/block/fluid/nitro_diesel.json index 1be7efae7..828dfef4b 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitro_diesel.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitro_diesel.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitro_diesel_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/nitro_diesel_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrocoal_fuel.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrocoal_fuel.json index 2474ec9e6..1721e138b 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitrocoal_fuel.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitrocoal_fuel.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitrocoal_fuel_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/nitrocoal_fuel_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrofuel.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrofuel.json index 1e9165fe9..a54c62e1d 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitrofuel.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitrofuel.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitrofuel_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/nitrofuel_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrogen.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrogen.json index 2206741de..be5252fb3 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitrogen.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitrogen.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitrogen_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/nitrogen_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrogen_dioxide.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrogen_dioxide.json index 1e3deb99a..77dc36631 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitrogen_dioxide.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitrogen_dioxide.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitrogen_dioxide_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/nitrogen_dioxide_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/oil.json b/src/main/resources/assets/techreborn/models/block/fluid/oil.json index a1e15b7c9..d9152f7c8 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/oil.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/oil.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/oil_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/oil_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/potassium.json b/src/main/resources/assets/techreborn/models/block/fluid/potassium.json index 510a05c4f..acc8ff090 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/potassium.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/potassium.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/potassium_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/potassium_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/silicon.json b/src/main/resources/assets/techreborn/models/block/fluid/silicon.json index efba153ad..3fcde94f6 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/silicon.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/silicon.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/silicon_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/silicon_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sodium.json b/src/main/resources/assets/techreborn/models/block/fluid/sodium.json index 9f2747005..0628aadcf 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/sodium.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/sodium.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/sodium_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/sodium_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sodium_persulfate.json b/src/main/resources/assets/techreborn/models/block/fluid/sodium_persulfate.json index edec262a7..7a1e2f67c 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/sodium_persulfate.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/sodium_persulfate.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/sodium_persulfate_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/sodium_persulfate_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sodium_sulfide.json b/src/main/resources/assets/techreborn/models/block/fluid/sodium_sulfide.json index 23cd0d22a..7dbf91c09 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/sodium_sulfide.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/sodium_sulfide.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/sodium_sulfide_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/sodium_sulfide_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sulfur.json b/src/main/resources/assets/techreborn/models/block/fluid/sulfur.json index 6443d53b9..1efadf085 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/sulfur.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/sulfur.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/sulfur_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/sulfur_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sulfuric_acid.json b/src/main/resources/assets/techreborn/models/block/fluid/sulfuric_acid.json index 2fa7344cd..5e27b72ec 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/sulfuric_acid.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/sulfuric_acid.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/sulfuric_acid_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/sulfuric_acid_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/tritium.json b/src/main/resources/assets/techreborn/models/block/fluid/tritium.json index 7f220a7b8..52105d9dc 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/tritium.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/tritium.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/tritium_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/tritium_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/block/fluid/wolframium.json b/src/main/resources/assets/techreborn/models/block/fluid/wolframium.json index 671612a9c..356454d7c 100644 --- a/src/main/resources/assets/techreborn/models/block/fluid/wolframium.json +++ b/src/main/resources/assets/techreborn/models/block/fluid/wolframium.json @@ -1,5 +1,6 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/wolframium_flowing" - } -} \ No newline at end of file +{ + "textures": { + "particle": "techreborn:block/fluids/wolframium_still" + } +} + diff --git a/src/main/resources/assets/techreborn/models/item/amethyst_dust.json b/src/main/resources/assets/techreborn/models/item/amethyst_dust.json new file mode 100644 index 000000000..c35d13841 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/amethyst_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/dust/amethyst_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/silver_boots.json b/src/main/resources/assets/techreborn/models/item/silver_boots.json new file mode 100644 index 000000000..34c002170 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/silver_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/silver_boots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/silver_chestplate.json b/src/main/resources/assets/techreborn/models/item/silver_chestplate.json new file mode 100644 index 000000000..8c413da91 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/silver_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/silver_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/silver_helmet.json b/src/main/resources/assets/techreborn/models/item/silver_helmet.json new file mode 100644 index 000000000..57db54a63 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/silver_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/silver_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/silver_leggings.json b/src/main/resources/assets/techreborn/models/item/silver_leggings.json new file mode 100644 index 000000000..caaa5048f --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/silver_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/silver_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/sponge_piece.json b/src/main/resources/assets/techreborn/models/item/sponge_piece.json new file mode 100644 index 000000000..81628f07e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/sponge_piece.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/part/sponge_piece" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/steel_boots.json b/src/main/resources/assets/techreborn/models/item/steel_boots.json new file mode 100644 index 000000000..01f43c629 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/steel_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/steel_boots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/steel_chestplate.json b/src/main/resources/assets/techreborn/models/item/steel_chestplate.json new file mode 100644 index 000000000..e17cbd394 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/steel_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/steel_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/steel_helmet.json b/src/main/resources/assets/techreborn/models/item/steel_helmet.json new file mode 100644 index 000000000..1364c57d2 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/steel_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/steel_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/steel_leggings.json b/src/main/resources/assets/techreborn/models/item/steel_leggings.json new file mode 100644 index 000000000..b3a04733b --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/steel_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/steel_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png index a944162a2..ef53d0e72 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_still.png new file mode 100644 index 000000000..cd96c6435 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png index 35475d862..1a46c1d3e 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png.mcmeta index b8533e510..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":4 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_still.png new file mode 100644 index 000000000..9435bc22a Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/biofuel_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png index 10ae3cde9..227998d53 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_still.png new file mode 100644 index 000000000..a29e19d72 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png index 45ac2ab7c..f03231129 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_still.png new file mode 100644 index 000000000..93014d63b Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calcium_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png index 3b68ff259..aa53a32db 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_still.png new file mode 100644 index 000000000..f17b5401f Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png index 7da312eb8..2c76dd0fe 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_still.png new file mode 100644 index 000000000..2b0ca1927 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbon_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png index 1171cb68d..36a3cc76a 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_still.png new file mode 100644 index 000000000..07fb99ed4 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png index 3f02d9037..efd9920a2 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_still.png new file mode 100644 index 000000000..3583c2c68 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png index b6fe0d2ed..82fe9d955 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_still.png new file mode 100644 index 000000000..c30f06d1c Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png index 3fe30e1da..4dddbe688 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/diesel_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_still.png new file mode 100644 index 000000000..e665a0d11 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/diesel_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png index ebef06022..d58d9cb45 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_still.png new file mode 100644 index 000000000..f86faf3c8 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png index 9e8409c19..fe310a96b 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_still.png new file mode 100644 index 000000000..79a7c9ba6 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png index f528fc939..b336328ff 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/helium3_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_still.png new file mode 100644 index 000000000..f2706f9a8 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/helium3_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png index b81d149cf..82d5787df 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/helium_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/helium_still.png new file mode 100644 index 000000000..c948d049d Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/helium_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/helium_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/helium_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/helium_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png index 397d139a8..730f0fbef 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png.mcmeta index 87c542d29..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":1 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_still.png new file mode 100644 index 000000000..6d5edc276 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png index 547685d0d..79b9faa28 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_still.png new file mode 100644 index 000000000..65afeb417 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png index 6eeaf2f4f..9aaf697f7 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/lithium_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_still.png new file mode 100644 index 000000000..d0f4b4fbd Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/lithium_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png index be3085df9..804a29862 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/mercury_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_still.png new file mode 100644 index 000000000..fd90d3e7b Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/mercury_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png index ba0433244..afb7f36ea 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/methane_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/methane_still.png new file mode 100644 index 000000000..ab2b5a441 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/methane_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/methane_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/methane_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/methane_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png index cf2b7b7ac..5b9afbf40 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_still.png new file mode 100644 index 000000000..6e2645f33 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png index b22e2fc45..9f81a440e 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_still.png new file mode 100644 index 000000000..632d40ee2 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png index 05992e31a..79c6add28 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_still.png new file mode 100644 index 000000000..3ef6b3c8e Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png index 906d42210..e9af4f279 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_still.png new file mode 100644 index 000000000..bddb60210 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png index e2b3654c6..9018a6995 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_still.png new file mode 100644 index 000000000..7a02dff8f Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png index d967e92b8..8a4b6bcc5 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_still.png new file mode 100644 index 000000000..849f8487c Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png index 89f2940d5..0615702d0 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png.mcmeta index b8533e510..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":4 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/oil_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/oil_still.png new file mode 100644 index 000000000..548675d6b Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/oil_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/oil_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/oil_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/oil_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png index 2338f7d57..7583f035e 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/potassium_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_still.png new file mode 100644 index 000000000..c24891aa3 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/potassium_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png index 9fa70949f..882a9be0e 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/silicon_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_still.png new file mode 100644 index 000000000..0abfaec2f Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/silicon_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png index 58155f0bc..3c4303761 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png index dffd6f3fa..94629bd26 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_still.png new file mode 100644 index 000000000..7f876000d Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_still.png new file mode 100644 index 000000000..c05a583b0 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png index e595a673c..6bd587d01 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_still.png new file mode 100644 index 000000000..05a46f9d9 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png index 7d83305ac..06690ae92 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png.mcmeta index 87c542d29..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":1 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_still.png new file mode 100644 index 000000000..5957603c8 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png index bda7e3824..57831def8 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_still.png new file mode 100644 index 000000000..128b9d450 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png index b6d236c70..ab575c49d 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png.mcmeta index 0df7234a7..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/tritium_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_still.png new file mode 100644 index 000000000..eb5e1d1ae Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/tritium_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png index 0015ce51d..e9a50e97b 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png and b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png.mcmeta index b8533e510..ff36d6b97 100644 --- a/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png.mcmeta @@ -1,5 +1,3 @@ -{ - "animation":{ - "frametime":4 - } -} \ No newline at end of file +{ + "animation": {} +} diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_still.png b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_still.png new file mode 100644 index 000000000..89d52dff6 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_still.png differ diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_still.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_still.png.mcmeta new file mode 100644 index 000000000..ec73bf83a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_on.png.mcmeta index 348bc0769..368d9a69d 100644 --- a/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_on.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_on.png.mcmeta @@ -5,8 +5,7 @@ 0, 1, 2, - 3, - 4 + 3 ] } } diff --git a/src/main/resources/assets/techreborn/textures/block/ore/deepslate/deepslate_galena_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/deepslate/deepslate_galena_ore.png index 9deebf206..866f5348d 100644 Binary files a/src/main/resources/assets/techreborn/textures/block/ore/deepslate/deepslate_galena_ore.png and b/src/main/resources/assets/techreborn/textures/block/ore/deepslate/deepslate_galena_ore.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/silver_boots.png b/src/main/resources/assets/techreborn/textures/item/armor/silver_boots.png new file mode 100644 index 000000000..68ca99c59 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/silver_boots.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/silver_chestplate.png b/src/main/resources/assets/techreborn/textures/item/armor/silver_chestplate.png new file mode 100644 index 000000000..0494e1a9f Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/silver_chestplate.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/silver_helmet.png b/src/main/resources/assets/techreborn/textures/item/armor/silver_helmet.png new file mode 100644 index 000000000..512759d1c Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/silver_helmet.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/silver_leggings.png b/src/main/resources/assets/techreborn/textures/item/armor/silver_leggings.png new file mode 100644 index 000000000..4c79b557e Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/silver_leggings.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/steel_boots.png b/src/main/resources/assets/techreborn/textures/item/armor/steel_boots.png new file mode 100644 index 000000000..94dc03eb0 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/steel_boots.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/steel_chestplate.png b/src/main/resources/assets/techreborn/textures/item/armor/steel_chestplate.png new file mode 100644 index 000000000..176c8f032 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/steel_chestplate.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/steel_helmet.png b/src/main/resources/assets/techreborn/textures/item/armor/steel_helmet.png new file mode 100644 index 000000000..f47d5c006 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/steel_helmet.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/steel_leggings.png b/src/main/resources/assets/techreborn/textures/item/armor/steel_leggings.png new file mode 100644 index 000000000..94d116700 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/steel_leggings.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/dust/amethyst_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/amethyst_dust.png new file mode 100644 index 000000000..5dcd71722 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/dust/amethyst_dust.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/part/sponge_piece.png b/src/main/resources/assets/techreborn/textures/item/part/sponge_piece.png new file mode 100644 index 000000000..a4678a999 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/part/sponge_piece.png differ diff --git a/src/main/resources/data/blockus/tags/items/barrels.json b/src/main/resources/data/blockus/tags/items/barrels.json new file mode 100644 index 000000000..167939930 --- /dev/null +++ b/src/main/resources/data/blockus/tags/items/barrels.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:barrel" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/amethyst_dusts.json b/src/main/resources/data/c/tags/items/amethyst_dusts.json new file mode 100644 index 000000000..4eaad3058 --- /dev/null +++ b/src/main/resources/data/c/tags/items/amethyst_dusts.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:amethyst_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/basalt.json b/src/main/resources/data/c/tags/items/basalt.json index e19b2f7cb..cb983e58d 100644 --- a/src/main/resources/data/c/tags/items/basalt.json +++ b/src/main/resources/data/c/tags/items/basalt.json @@ -1,6 +1,7 @@ { "values": [ "minecraft:basalt", - "minecraft:polished_basalt" + "minecraft:polished_basalt", + "minecraft:smooth_basalt" ] } diff --git a/src/main/resources/data/c/tags/items/coral_blocks.json b/src/main/resources/data/c/tags/items/coral_blocks.json new file mode 100644 index 000000000..01322f95c --- /dev/null +++ b/src/main/resources/data/c/tags/items/coral_blocks.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#c:living_coral_blocks", + "#c:dead_coral_blocks" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/coral_fans.json b/src/main/resources/data/c/tags/items/coral_fans.json new file mode 100644 index 000000000..ba47fbdb9 --- /dev/null +++ b/src/main/resources/data/c/tags/items/coral_fans.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#c:living_coral_fans", + "#c:dead_coral_fans" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/coral_plants.json b/src/main/resources/data/c/tags/items/coral_plants.json new file mode 100644 index 000000000..cd9108763 --- /dev/null +++ b/src/main/resources/data/c/tags/items/coral_plants.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#c:living_coral_plants", + "#c:dead_coral_plants" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/dead_coral_blocks.json b/src/main/resources/data/c/tags/items/dead_coral_blocks.json new file mode 100644 index 000000000..ae6d8b464 --- /dev/null +++ b/src/main/resources/data/c/tags/items/dead_coral_blocks.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:dead_tube_coral_block", + "minecraft:dead_brain_coral_block", + "minecraft:dead_bubble_coral_block", + "minecraft:dead_fire_coral_block", + "minecraft:dead_horn_coral_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/dead_coral_fans.json b/src/main/resources/data/c/tags/items/dead_coral_fans.json new file mode 100644 index 000000000..99dbc9b53 --- /dev/null +++ b/src/main/resources/data/c/tags/items/dead_coral_fans.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:dead_tube_coral_fan", + "minecraft:dead_brain_coral_fan", + "minecraft:dead_bubble_coral_fan", + "minecraft:dead_fire_coral_fan", + "minecraft:dead_horn_coral_fan" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/dead_coral_plants.json b/src/main/resources/data/c/tags/items/dead_coral_plants.json new file mode 100644 index 000000000..fb729221a --- /dev/null +++ b/src/main/resources/data/c/tags/items/dead_coral_plants.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:dead_tube_coral", + "minecraft:dead_brain_coral", + "minecraft:dead_bubble_coral", + "minecraft:dead_fire_coral", + "minecraft:dead_horn_coral" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/grass_variants.json b/src/main/resources/data/c/tags/items/grass_variants.json new file mode 100644 index 000000000..62e6e418b --- /dev/null +++ b/src/main/resources/data/c/tags/items/grass_variants.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:grass", + "minecraft:tall_grass", + "minecraft:fern", + "minecraft:large_fern", + "minecraft:moss_carpet", + "minecraft:seagrass" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/living_coral_blocks.json b/src/main/resources/data/c/tags/items/living_coral_blocks.json new file mode 100644 index 000000000..a0708d789 --- /dev/null +++ b/src/main/resources/data/c/tags/items/living_coral_blocks.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:tube_coral_block", + "minecraft:brain_coral_block", + "minecraft:bubble_coral_block", + "minecraft:fire_coral_block", + "minecraft:horn_coral_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/living_coral_fans.json b/src/main/resources/data/c/tags/items/living_coral_fans.json new file mode 100644 index 000000000..992276ab9 --- /dev/null +++ b/src/main/resources/data/c/tags/items/living_coral_fans.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:tube_coral_fan", + "minecraft:brain_coral_fan", + "minecraft:bubble_coral_fan", + "minecraft:fire_coral_fan", + "minecraft:horn_coral_fan" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/living_coral_plants.json b/src/main/resources/data/c/tags/items/living_coral_plants.json new file mode 100644 index 000000000..b82b8dec1 --- /dev/null +++ b/src/main/resources/data/c/tags/items/living_coral_plants.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:tube_coral", + "minecraft:brain_coral", + "minecraft:bubble_coral", + "minecraft:fire_coral", + "minecraft:horn_coral" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/small_corals_blue.json b/src/main/resources/data/c/tags/items/small_corals_blue.json new file mode 100644 index 000000000..0242a087c --- /dev/null +++ b/src/main/resources/data/c/tags/items/small_corals_blue.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:tube_coral", + "minecraft:tube_coral_fan" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/small_corals_dead.json b/src/main/resources/data/c/tags/items/small_corals_dead.json new file mode 100644 index 000000000..2222b0fd5 --- /dev/null +++ b/src/main/resources/data/c/tags/items/small_corals_dead.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#c:dead_coral_plants", + "#c:dead_coral_fans" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/small_corals_pink.json b/src/main/resources/data/c/tags/items/small_corals_pink.json new file mode 100644 index 000000000..4c5baad0e --- /dev/null +++ b/src/main/resources/data/c/tags/items/small_corals_pink.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:brain_coral", + "minecraft:brain_coral_fan" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/small_corals_purple.json b/src/main/resources/data/c/tags/items/small_corals_purple.json new file mode 100644 index 000000000..59a07959a --- /dev/null +++ b/src/main/resources/data/c/tags/items/small_corals_purple.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:bubble_coral", + "minecraft:bubble_coral_fan" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/small_corals_red.json b/src/main/resources/data/c/tags/items/small_corals_red.json new file mode 100644 index 000000000..735fa7c66 --- /dev/null +++ b/src/main/resources/data/c/tags/items/small_corals_red.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:fire_coral", + "minecraft:fire_coral_fan" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/small_corals_yellow.json b/src/main/resources/data/c/tags/items/small_corals_yellow.json new file mode 100644 index 000000000..7f8cb9951 --- /dev/null +++ b/src/main/resources/data/c/tags/items/small_corals_yellow.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:horn_coral", + "minecraft:horn_coral_fan" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json new file mode 100644 index 000000000..c7a0bd3ee --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_leaves" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index 18e1ad146..16d1cc295 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -8,9 +8,11 @@ "techreborn:chrome_storage_block_slab", "techreborn:electrum_storage_block_slab", "techreborn:invar_storage_block_slab", + "techreborn:raw_iridium_storage_block_slab", "techreborn:iridium_storage_block_slab", "techreborn:iridium_reinforced_stone_storage_block_slab", "techreborn:iridium_reinforced_tungstensteel_storage_block_slab", + "techreborn:raw_lead_storage_block_slab", "techreborn:lead_storage_block_slab", "techreborn:nickel_storage_block_slab", "techreborn:peridot_storage_block_slab", @@ -19,10 +21,13 @@ "techreborn:refined_iron_storage_block_slab", "techreborn:ruby_storage_block_slab", "techreborn:sapphire_storage_block_slab", + "techreborn:raw_silver_storage_block_slab", "techreborn:silver_storage_block_slab", "techreborn:steel_storage_block_slab", + "techreborn:raw_tin_storage_block_slab", "techreborn:tin_storage_block_slab", "techreborn:titanium_storage_block_slab", + "techreborn:raw_tungsten_storage_block_slab", "techreborn:tungsten_storage_block_slab", "techreborn:tungstensteel_storage_block_slab", "techreborn:yellow_garnet_storage_block_slab", diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index 831a6d2cf..fc2fe868a 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -8,9 +8,11 @@ "techreborn:chrome_storage_block_stairs", "techreborn:electrum_storage_block_stairs", "techreborn:invar_storage_block_stairs", + "techreborn:raw_iridium_storage_block_stairs", "techreborn:iridium_storage_block_stairs", "techreborn:iridium_reinforced_stone_storage_block_stairs", "techreborn:iridium_reinforced_tungstensteel_storage_block_stairs", + "techreborn:raw_lead_storage_block_stairs", "techreborn:lead_storage_block_stairs", "techreborn:nickel_storage_block_stairs", "techreborn:peridot_storage_block_stairs", @@ -19,10 +21,13 @@ "techreborn:refined_iron_storage_block_stairs", "techreborn:ruby_storage_block_stairs", "techreborn:sapphire_storage_block_stairs", + "techreborn:raw_silver_storage_block_stairs", "techreborn:silver_storage_block_stairs", "techreborn:steel_storage_block_stairs", + "techreborn:raw_tin_storage_block_stairs", "techreborn:tin_storage_block_stairs", "techreborn:titanium_storage_block_stairs", + "techreborn:raw_tungsten_storage_block_stairs", "techreborn:tungsten_storage_block_stairs", "techreborn:tungstensteel_storage_block_stairs", "techreborn:yellow_garnet_storage_block_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index eed95185c..23a0ff9d5 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -8,9 +8,11 @@ "techreborn:copper_wall", "techreborn:electrum_storage_block_wall", "techreborn:invar_storage_block_wall", + "techreborn:raw_iridium_storage_block_wall", "techreborn:iridium_storage_block_wall", "techreborn:iridium_reinforced_stone_storage_block_wall", "techreborn:iridium_reinforced_tungstensteel_storage_block_wall", + "techreborn:raw_lead_storage_block_wall", "techreborn:lead_storage_block_wall", "techreborn:nickel_storage_block_wall", "techreborn:peridot_storage_block_wall", @@ -19,10 +21,13 @@ "techreborn:refined_iron_storage_block_wall", "techreborn:ruby_storage_block_wall", "techreborn:sapphire_storage_block_wall", + "techreborn:raw_silver_storage_block_wall", "techreborn:silver_storage_block_wall", "techreborn:steel_storage_block_wall", "techreborn:tin_storage_block_wall", + "techreborn:raw_tin_storage_block_wall", "techreborn:titanium_storage_block_wall", + "techreborn:raw_tungsten_storage_block_wall", "techreborn:tungsten_storage_block_wall", "techreborn:tungstensteel_storage_block_wall", "techreborn:yellow_garnet_storage_block_wall", diff --git a/src/main/resources/data/minecraft/tags/items/beacon_payment_items.json b/src/main/resources/data/minecraft/tags/items/beacon_payment_items.json new file mode 100644 index 000000000..d9cc287e0 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/beacon_payment_items.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#techreborn:ingots" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json b/src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json new file mode 100644 index 000000000..cdbdc9254 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "techreborn:basic_drill", + "techreborn:advanced_drill", + "techreborn:industrial_drill", + "techreborn:omni_tool" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/freeze_immune_wearables.json b/src/main/resources/data/minecraft/tags/items/freeze_immune_wearables.json new file mode 100644 index 000000000..a80755bca --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/freeze_immune_wearables.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "techreborn:quantum_helmet", + "techreborn:quantum_chestplate", + "techreborn:quantum_leggings", + "techreborn:quantum_boots" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/byg_compat/ametrine_gem.json b/src/main/resources/data/techreborn/recipes/byg_compat/ametrine_gem.json index 32f44dc34..79bef8fb4 100644 --- a/src/main/resources/data/techreborn/recipes/byg_compat/ametrine_gem.json +++ b/src/main/resources/data/techreborn/recipes/byg_compat/ametrine_gem.json @@ -12,7 +12,12 @@ "item": "byg:ametrine_gems" } ], - "conditions": { - "reborncore:mod": "byg" - } + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "byg" + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/byg_compat/anthracite.json b/src/main/resources/data/techreborn/recipes/byg_compat/anthracite.json index d1aaed2fe..c310b195e 100644 --- a/src/main/resources/data/techreborn/recipes/byg_compat/anthracite.json +++ b/src/main/resources/data/techreborn/recipes/byg_compat/anthracite.json @@ -13,7 +13,12 @@ "count": 2 } ], - "conditions": { - "reborncore:mod": "byg" - } + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "byg" + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/byg_compat/coal_dust_from_anthracite.json b/src/main/resources/data/techreborn/recipes/byg_compat/coal_dust_from_anthracite.json index e68314b06..7f987c583 100644 --- a/src/main/resources/data/techreborn/recipes/byg_compat/coal_dust_from_anthracite.json +++ b/src/main/resources/data/techreborn/recipes/byg_compat/coal_dust_from_anthracite.json @@ -12,7 +12,12 @@ "item": "techreborn:coal_dust" } ], - "conditions": { - "reborncore:mod": "byg" - } + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "byg" + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/byg_compat/coal_dust_from_lignite.json b/src/main/resources/data/techreborn/recipes/byg_compat/coal_dust_from_lignite.json index fc27c3f25..14ff371fe 100644 --- a/src/main/resources/data/techreborn/recipes/byg_compat/coal_dust_from_lignite.json +++ b/src/main/resources/data/techreborn/recipes/byg_compat/coal_dust_from_lignite.json @@ -12,7 +12,12 @@ "item": "techreborn:coal_dust" } ], - "conditions": { - "reborncore:mod": "byg" - } + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "byg" + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/byg_compat/lignite.json b/src/main/resources/data/techreborn/recipes/byg_compat/lignite.json index faae837d9..0c6356d8f 100644 --- a/src/main/resources/data/techreborn/recipes/byg_compat/lignite.json +++ b/src/main/resources/data/techreborn/recipes/byg_compat/lignite.json @@ -13,7 +13,12 @@ "count": 2 } ], - "conditions": { - "reborncore:mod": "byg" - } + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "byg" + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/byg_compat/pendorite_scraps.json b/src/main/resources/data/techreborn/recipes/byg_compat/pendorite_scraps.json index f25dfff50..764e3d099 100644 --- a/src/main/resources/data/techreborn/recipes/byg_compat/pendorite_scraps.json +++ b/src/main/resources/data/techreborn/recipes/byg_compat/pendorite_scraps.json @@ -12,7 +12,12 @@ "item": "byg:pendorite_scraps" } ], - "conditions": { - "reborncore:mod": "byg" - } + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "byg" + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/brain_coral_block.json b/src/main/resources/data/techreborn/recipes/centrifuge/brain_coral_block.json new file mode 100644 index 000000000..45e3c2930 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/brain_coral_block.json @@ -0,0 +1,35 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:brain_coral_block", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "minecraft:dead_brain_coral", + "count": 24 + }, + { + "item": "minecraft:dead_brain_coral_fan", + "count": 12 + }, + { + "item": "minecraft:pink_dye", + "count": 16 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/bubble_coral_block.json b/src/main/resources/data/techreborn/recipes/centrifuge/bubble_coral_block.json new file mode 100644 index 000000000..dc0d96665 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/bubble_coral_block.json @@ -0,0 +1,35 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:bubble_coral_block", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "minecraft:dead_bubble_coral", + "count": 24 + }, + { + "item": "minecraft:dead_bubble_coral_fan", + "count": 12 + }, + { + "item": "minecraft:purple_dye", + "count": 16 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/coarse_dirt.json b/src/main/resources/data/techreborn/recipes/centrifuge/coarse_dirt.json new file mode 100644 index 000000000..c41968877 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/coarse_dirt.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 2500, + "ingredients": [ + { + "item": "minecraft:coarse_dirt", + "count": 16 + } + ], + "results": [ + { + "item": "minecraft:gravel", + "count": 8 + }, + { + "item": "minecraft:flint" + }, + { + "item": "minecraft:sand", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/crimson_nylium.json b/src/main/resources/data/techreborn/recipes/centrifuge/crimson_nylium.json new file mode 100644 index 000000000..d8ff372d5 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/crimson_nylium.json @@ -0,0 +1,21 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 1640, + "ingredients": [ + { + "item": "minecraft:crimson_nylium", + "count": 8 + } + ], + "results": [ + { + "item": "minecraft:netherrack", + "count": 6 + }, + { + "item": "minecraft:crimson_fungus", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/egg.json b/src/main/resources/data/techreborn/recipes/centrifuge/egg.json new file mode 100644 index 000000000..2f8d0196f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/egg.json @@ -0,0 +1,26 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:egg", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "techreborn:calcite_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/fire_coral_block.json b/src/main/resources/data/techreborn/recipes/centrifuge/fire_coral_block.json new file mode 100644 index 000000000..f5a8044c9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/fire_coral_block.json @@ -0,0 +1,35 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:fire_coral_block", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "minecraft:dead_fire_coral", + "count": 24 + }, + { + "item": "minecraft:dead_fire_coral_fan", + "count": 12 + }, + { + "item": "minecraft:red_dye", + "count": 16 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/glow_berries.json b/src/main/resources/data/techreborn/recipes/centrifuge/glow_berries.json new file mode 100644 index 000000000..8739dfd83 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/glow_berries.json @@ -0,0 +1,31 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:glow_berries", + "count": 32 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "minecraft:orange_dye", + "count": 2 + }, + { + "item": "minecraft:glowstone_dust", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/grass_block.json b/src/main/resources/data/techreborn/recipes/centrifuge/grass_block.json index b9a14a9ed..7ad2cbcdf 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/grass_block.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/grass_block.json @@ -21,8 +21,8 @@ "count": 2 }, { - "item": "minecraft:wheat_seeds", - "count": 4 + "item": "techreborn:plantball", + "count": 2 } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/horn_coral_block.json b/src/main/resources/data/techreborn/recipes/centrifuge/horn_coral_block.json new file mode 100644 index 000000000..c6c2726da --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/horn_coral_block.json @@ -0,0 +1,35 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:horn_coral_block", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "minecraft:dead_horn_coral", + "count": 24 + }, + { + "item": "minecraft:dead_horn_coral_fan", + "count": 12 + }, + { + "item": "minecraft:yellow_dye", + "count": 16 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/moss_block.json b/src/main/resources/data/techreborn/recipes/centrifuge/moss_block.json new file mode 100644 index 000000000..e427bc6b7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/moss_block.json @@ -0,0 +1,29 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 2500, + "ingredients": [ + { + "item": "minecraft:moss_block", + "count": 16 + } + ], + "results": [ + { + "item": "techreborn:plantball", + "count": 9 + }, + { + "item": "minecraft:dirt", + "count": 4 + }, + { + "item": "minecraft:sand", + "count": 2 + }, + { + "item": "minecraft:gravel", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/poisonous_potato.json b/src/main/resources/data/techreborn/recipes/centrifuge/nether_wart_block.json similarity index 87% rename from src/main/resources/data/techreborn/recipes/centrifuge/poisonous_potato.json rename to src/main/resources/data/techreborn/recipes/centrifuge/nether_wart_block.json index a43a39cbb..fc82b0a99 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/poisonous_potato.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/nether_wart_block.json @@ -4,7 +4,7 @@ "time": 5000, "ingredients": [ { - "item": "minecraft:poisonous_potato", + "item": "minecraft:nether_wart_block", "count": 12 }, { diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/podzol.json b/src/main/resources/data/techreborn/recipes/centrifuge/podzol.json new file mode 100644 index 000000000..e7e2a0364 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/podzol.json @@ -0,0 +1,28 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 2500, + "ingredients": [ + { + "item": "minecraft:podzol", + "count": 16 + } + ], + "results": [ + { + "item": "minecraft:sand", + "count": 8 + }, + { + "item": "minecraft:clay_ball", + "count": 2 + }, + { + "item": "minecraft:gravel", + "count": 2 + }, + { + "item": "techreborn:plantball" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/rooted_dirt.json b/src/main/resources/data/techreborn/recipes/centrifuge/rooted_dirt.json new file mode 100644 index 000000000..c482b4b28 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/rooted_dirt.json @@ -0,0 +1,28 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 2500, + "ingredients": [ + { + "item": "minecraft:rooted_dirt", + "count": 16 + } + ], + "results": [ + { + "item": "minecraft:sand", + "count": 8 + }, + { + "item": "minecraft:clay_ball" + }, + { + "item": "minecraft:gravel", + "count": 2 + }, + { + "item": "minecraft:hanging_roots", + "count": 7 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/shroomlight.json b/src/main/resources/data/techreborn/recipes/centrifuge/shroomlight.json new file mode 100644 index 000000000..9d16d18ac --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/shroomlight.json @@ -0,0 +1,27 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:shroomlight", + "count": 8 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "minecraft:glowstone_dust", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/sweet_berries.json b/src/main/resources/data/techreborn/recipes/centrifuge/sweet_berries.json index a8ab0593c..7e4418142 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/sweet_berries.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/sweet_berries.json @@ -18,6 +18,10 @@ "nbt": { "fluid": "techreborn:methane" } - } + }, + { + "item": "minecraft:red_dye", + "count": 5 + } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/tube_coral_block.json b/src/main/resources/data/techreborn/recipes/centrifuge/tube_coral_block.json new file mode 100644 index 000000000..b9ca9f9bc --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/tube_coral_block.json @@ -0,0 +1,35 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:tube_coral_block", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "minecraft:dead_tube_coral", + "count": 24 + }, + { + "item": "minecraft:dead_tube_coral_fan", + "count": 12 + }, + { + "item": "minecraft:blue_dye", + "count": 16 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/tuff.json b/src/main/resources/data/techreborn/recipes/centrifuge/tuff.json new file mode 100644 index 000000000..256653156 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/tuff.json @@ -0,0 +1,21 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 2500, + "ingredients": [ + { + "item": "minecraft:tuff", + "count": 16 + } + ], + "results": [ + { + "item": "techreborn:dark_ashes_dust", + "count": 18 + }, + { + "item": "techreborn:ashes_dust", + "count": 12 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/turtle_egg.json b/src/main/resources/data/techreborn/recipes/centrifuge/turtle_egg.json new file mode 100644 index 000000000..817b6dc1d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/turtle_egg.json @@ -0,0 +1,26 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:turtle_egg", + "count": 32 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "techreborn:calcite_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/warped_nylium.json b/src/main/resources/data/techreborn/recipes/centrifuge/warped_nylium.json new file mode 100644 index 000000000..adf0de5a3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/warped_nylium.json @@ -0,0 +1,21 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 1640, + "ingredients": [ + { + "item": "minecraft:warped_nylium", + "count": 8 + } + ], + "results": [ + { + "item": "minecraft:netherrack", + "count": 6 + }, + { + "item": "minecraft:warped_fungus", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/warped_wart_block.json b/src/main/resources/data/techreborn/recipes/centrifuge/warped_wart_block.json new file mode 100644 index 000000000..08112274c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/warped_wart_block.json @@ -0,0 +1,27 @@ +{ + "type": "techreborn:centrifuge", + "power": 5, + "time": 5000, + "ingredients": [ + { + "item": "minecraft:warped_wart_block", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "nbt": { + "fluid": "techreborn:methane" + } + }, + { + "item": "techreborn:ender_pearl_dust", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/bone.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/bone.json new file mode 100644 index 000000000..6a0af61e2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/bone.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "tag": "c:calcite_dusts", + "count": 3 + }, + { + "item": "minecraft:slime_ball" + } + ], + "results": [ + { + "item": "minecraft:bone" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/dark_prismarine.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/dark_prismarine.json new file mode 100644 index 000000000..2a1e602fc --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/dark_prismarine.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:prismarine", + "count": 2 + }, + { + "item": "minecraft:black_dye" + } + ], + "results": [ + { + "item": "minecraft:dark_prismarine" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/glow_ink_sac.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/glow_ink_sac.json new file mode 100644 index 000000000..4e4d90603 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/glow_ink_sac.json @@ -0,0 +1,21 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:ink_sac", + "count": 3 + }, + { + "item": "minecraft:prismarine_crystals", + "count": 2 + } + ], + "results": [ + { + "item": "minecraft:glow_ink_sac", + "count": 3 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/glowstone.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/glowstone.json new file mode 100644 index 000000000..133ee2154 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/glowstone.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "tag": "c:glowstone_small_dusts", + "count": 6 + }, + { + "item": "minecraft:sea_lantern" + } + ], + "results": [ + { + "item": "minecraft:glowstone" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_diesel.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_diesel.json index 2a357b141..d78f8aad9 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_diesel.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_diesel.json @@ -15,10 +15,10 @@ "results": [ { "item": "techreborn:cell", - "count": 5, + "count": 2, "nbt": { "fluid": "techreborn:nitro_diesel" } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrocoal_fuel.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrocoal_fuel.json index 5a6691563..c5880884a 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrocoal_fuel.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrocoal_fuel.json @@ -15,10 +15,10 @@ "results": [ { "item": "techreborn:cell", - "count": 5, + "count": 2, "nbt": { "fluid": "techreborn:nitrocoal_fuel" } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrogen_dioxide.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrogen_dioxide.json index f46f9a5d0..010907a5c 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrogen_dioxide.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrogen_dioxide.json @@ -15,9 +15,10 @@ "results": [ { "item": "techreborn:cell", + "count": 2, "nbt": { "fluid": "techreborn:nitrogen_dioxide" } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/pointed_dripstone.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/pointed_dripstone.json new file mode 100644 index 000000000..51f3bac70 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/pointed_dripstone.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "tag": "c:calcite_small_dusts", + "count": 3 + }, + { + "item": "minecraft:slime_ball" + } + ], + "results": [ + { + "item": "minecraft:pointed_dripstone" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/sea_lantern.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/sea_lantern.json new file mode 100644 index 000000000..3c2a922cc --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/sea_lantern.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:prismarine_crystals", + "count": 6 + }, + { + "item": "minecraft:glowstone" + } + ], + "results": [ + { + "item": "minecraft:sea_lantern" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_brown.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_brown.json new file mode 100644 index 000000000..34442af27 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_brown.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:glowstone_dust", + "count": 4 + }, + { + "item": "minecraft:brown_mushroom_block" + } + ], + "results": [ + { + "item": "minecraft:shroomlight" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_crimson.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_crimson.json new file mode 100644 index 000000000..4f1bdfddc --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_crimson.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:glowstone_dust", + "count": 4 + }, + { + "item": "minecraft:nether_wart_block" + } + ], + "results": [ + { + "item": "minecraft:shroomlight" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_red.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_red.json new file mode 100644 index 000000000..38a5866f0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_red.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:glowstone_dust", + "count": 4 + }, + { + "item": "minecraft:red_mushroom_block" + } + ], + "results": [ + { + "item": "minecraft:shroomlight" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_warped.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_warped.json new file mode 100644 index 000000000..dde24df38 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/shroomlight_from_warped.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:glowstone_dust", + "count": 4 + }, + { + "item": "minecraft:warped_wart_block" + } + ], + "results": [ + { + "item": "minecraft:shroomlight" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/stripped_warped_hyphae.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/stripped_warped_hyphae.json new file mode 100644 index 000000000..d11e12f5c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/stripped_warped_hyphae.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 500, + "ingredients": [ + { + "item": "minecraft:stripped_crimson_hyphae" + }, + { + "tag": "c:ender_pearl_dusts", + "count": 2 + } + ], + "results": [ + { + "item": "minecraft:stripped_warped_hyphae" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/stripped_warped_stem.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/stripped_warped_stem.json new file mode 100644 index 000000000..9840c0021 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/stripped_warped_stem.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 500, + "ingredients": [ + { + "item": "minecraft:stripped_crimson_stem" + }, + { + "tag": "c:ender_pearl_dusts", + "count": 2 + } + ], + "results": [ + { + "item": "minecraft:stripped_warped_stem" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/sulfuric_acid.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/sulfuric_acid.json index 37f40e74f..3a003788e 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/sulfuric_acid.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/sulfuric_acid.json @@ -15,10 +15,10 @@ "results": [ { "item": "techreborn:cell", - "count": 3, + "count": 2, "nbt": { "fluid": "techreborn:sulfuric_acid" } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_button.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_button.json new file mode 100644 index 000000000..417a91cb2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_button.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:crimson_button", + "count": 2 + }, + { + "tag": "c:ender_pearl_dusts" + } + ], + "results": [ + { + "item": "minecraft:warped_button", + "count": 2 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_door.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_door.json new file mode 100644 index 000000000..f8d32841b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_door.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:crimson_door", + "count": 2 + }, + { + "tag": "c:ender_pearl_dusts" + } + ], + "results": [ + { + "item": "minecraft:warped_door", + "count": 2 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_fence.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_fence.json new file mode 100644 index 000000000..5c539123b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_fence.json @@ -0,0 +1,21 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 500, + "ingredients": [ + { + "item": "minecraft:crimson_fence", + "count": 3 + }, + { + "tag": "c:ender_pearl_dusts", + "count": 2 + } + ], + "results": [ + { + "item": "minecraft:warped_fence", + "count": 3 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_fence_gate.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_fence_gate.json new file mode 100644 index 000000000..2c394e128 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_fence_gate.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:crimson_fence_gate", + "count": 2 + }, + { + "tag": "c:ender_pearl_dusts" + } + ], + "results": [ + { + "item": "minecraft:warped_fence_gate", + "count": 2 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_hyphae.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_hyphae.json new file mode 100644 index 000000000..f5ba8f571 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_hyphae.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 500, + "ingredients": [ + { + "item": "minecraft:crimson_hyphae" + }, + { + "tag": "c:ender_pearl_dusts", + "count": 2 + } + ], + "results": [ + { + "item": "minecraft:warped_hyphae" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_planks.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_planks.json new file mode 100644 index 000000000..599136888 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_planks.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:crimson_planks", + "count": 2 + }, + { + "tag": "c:ender_pearl_dusts" + } + ], + "results": [ + { + "item": "minecraft:warped_planks", + "count": 2 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_pressure_plate.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_pressure_plate.json new file mode 100644 index 000000000..90f6ab705 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_pressure_plate.json @@ -0,0 +1,18 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:crimson_pressure_plate" + }, + { + "tag": "c:ender_pearl_dusts" + } + ], + "results": [ + { + "item": "minecraft:warped_pressure_plate" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_sign.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_sign.json new file mode 100644 index 000000000..9b8128c4f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_sign.json @@ -0,0 +1,18 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:crimson_sign" + }, + { + "tag": "c:ender_pearl_dusts" + } + ], + "results": [ + { + "item": "minecraft:warped_sign" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_slab.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_slab.json new file mode 100644 index 000000000..1c030f60a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_slab.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:crimson_slab", + "count": 4 + }, + { + "tag": "c:ender_pearl_dusts" + } + ], + "results": [ + { + "item": "minecraft:warped_slab", + "count": 4 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_stairs.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_stairs.json new file mode 100644 index 000000000..5933dbca3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 600, + "ingredients": [ + { + "item": "minecraft:crimson_stairs", + "count": 4 + }, + { + "tag": "c:ender_pearl_dusts", + "count": 3 + } + ], + "results": [ + { + "item": "minecraft:warped_stairs", + "count": 4 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_stem.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_stem.json new file mode 100644 index 000000000..988f3b4a3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_stem.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 500, + "ingredients": [ + { + "item": "minecraft:crimson_stem" + }, + { + "tag": "c:ender_pearl_dusts", + "count": 2 + } + ], + "results": [ + { + "item": "minecraft:warped_stem" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_trapdoor.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_trapdoor.json new file mode 100644 index 000000000..dd7583226 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_trapdoor.json @@ -0,0 +1,21 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 600, + "ingredients": [ + { + "item": "minecraft:crimson_trapdoor", + "count": 2 + }, + { + "tag": "c:ender_pearl_dusts", + "count": 3 + } + ], + "results": [ + { + "item": "minecraft:warped_trapdoor", + "count": 2 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_wart_block.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_wart_block.json new file mode 100644 index 000000000..c9d1a5dac --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/warped_wart_block.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 500, + "ingredients": [ + { + "item": "minecraft:nether_wart_block" + }, + { + "tag": "c:ender_pearl_dusts", + "count": 2 + } + ], + "results": [ + { + "item": "minecraft:warped_wart_block" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/water.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/water.json index 6fb49b8a3..726583403 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/water.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/water.json @@ -15,9 +15,10 @@ "results": [ { "item": "techreborn:cell", + "count": 2, "nbt": { "fluid": "minecraft:water" } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/wither_skeleton_skull.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/wither_skeleton_skull.json new file mode 100644 index 000000000..b42a783e8 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/wither_skeleton_skull.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "item": "minecraft:wither_rose", + "count": 8 + }, + { + "item": "minecraft:skeleton_skull" + } + ], + "results": [ + { + "item": "minecraft:wither_skeleton_skull" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/compressor/blaze_rod.json b/src/main/resources/data/techreborn/recipes/compressor/blaze_rod.json new file mode 100644 index 000000000..22c570f1d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/compressor/blaze_rod.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:compressor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:blaze_powder", + "count": 5 + } + ], + "results": [ + { + "item": "minecraft:blaze_rod" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/compressor/calcite.json b/src/main/resources/data/techreborn/recipes/compressor/calcite.json new file mode 100644 index 000000000..766fee634 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/compressor/calcite.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:compressor", + "power": 10, + "time": 300, + "ingredients": [ + { + "tag": "c:calcite_small_dusts", + "count": 5 + } + ], + "results": [ + { + "item": "minecraft:calcite" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball.json index 0a3b51483..2f6fb6820 100644 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball.json +++ b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball.json @@ -1,16 +1,16 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "tag": "minecraft:leaves", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file +{ + "type": "techreborn:compressor", + "power": 2, + "time": 400, + "ingredients": [ + { + "tag": "techreborn:plantball_material", + "count": 8 + } + ], + "results": [ + { + "item": "techreborn:compressed_plantball" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_1.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_1.json deleted file mode 100644 index 36ad3e4b2..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_1.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "tag": "minecraft:saplings", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_10.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_10.json deleted file mode 100644 index 5a688c851..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_10.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:melon", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_2.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_2.json deleted file mode 100644 index db73cbcde..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_2.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:sugar_cane", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_3.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_3.json deleted file mode 100644 index 0b1e66933..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_3.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:cactus", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_4.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_4.json deleted file mode 100644 index d0506eb0c..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_4.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:wheat", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_5.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_5.json deleted file mode 100644 index 4f7ba82c5..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_5.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:carrot", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_6.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_6.json deleted file mode 100644 index 40e311d42..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_6.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:potato", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_7.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_7.json deleted file mode 100644 index 326a817b3..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_7.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:apple", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_9.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_9.json deleted file mode 100644 index a388d3628..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_9.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:pumpkin", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_from_kelp.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_from_kelp.json deleted file mode 100644 index 1b193d2e8..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_from_kelp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:kelp", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_8.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_from_melon_slices.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_8.json rename to src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_from_melon_slices.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_from_sweet_berries.json b/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_from_sweet_berries.json deleted file mode 100644 index cd17e7ba0..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_from_sweet_berries.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 2, - "time": 400, - "ingredients": [ - { - "item": "minecraft:sweet_berries", - "count": 8 - } - ], - "results": [ - { - "item": "techreborn:compressed_plantball" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/prismarine_bricks.json b/src/main/resources/data/techreborn/recipes/compressor/prismarine_bricks.json new file mode 100644 index 000000000..9c3bf5cf4 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/compressor/prismarine_bricks.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:compressor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:prismarine", + "count": 2 + } + ], + "results": [ + { + "item": "minecraft:prismarine_bricks" + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_boots.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_boots.json new file mode 100644 index 000000000..6316ff034 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_boots.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "item": "techreborn:silver_ingot" + } + }, + "result": { + "item": "techreborn:silver_boots" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_chestplate.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_chestplate.json new file mode 100644 index 000000000..f8b68c4a3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "item": "techreborn:silver_ingot" + } + }, + "result": { + "item": "techreborn:silver_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_helmet.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_helmet.json new file mode 100644 index 000000000..89ba0b229 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_helmet.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "item": "techreborn:silver_ingot" + } + }, + "result": { + "item": "techreborn:silver_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_leggings.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_leggings.json new file mode 100644 index 000000000..a713f2882 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "item": "techreborn:silver_ingot" + } + }, + "result": { + "item": "techreborn:silver_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_boots.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_boots.json new file mode 100644 index 000000000..8b012b3db --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_boots.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "item": "techreborn:steel_ingot" + } + }, + "result": { + "item": "techreborn:steel_boots" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_chestplate.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_chestplate.json new file mode 100644 index 000000000..4671c0c40 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "item": "techreborn:steel_ingot" + } + }, + "result": { + "item": "techreborn:steel_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_helmet.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_helmet.json new file mode 100644 index 000000000..bee96ac62 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_helmet.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "item": "techreborn:steel_ingot" + } + }, + "result": { + "item": "techreborn:steel_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_leggings.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_leggings.json new file mode 100644 index 000000000..1e585249a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/steel_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "item": "techreborn:steel_ingot" + } + }, + "result": { + "item": "techreborn:steel_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine/drain.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/drain.json index 6614212ef..5cc8f6acb 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/machine/drain.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine/drain.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ + "PXP", "PHP", - "FBF", - "PFP" + "PBP" ], "key": { "P": { @@ -15,8 +15,8 @@ "H": { "item": "minecraft:hopper" }, - "F": { - "item": "techreborn:basic_machine_frame" + "X": { + "item": "minecraft:iron_bars" } }, "result": { diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine/hv_transformer.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/hv_transformer.json index 8c63ab62c..3852f10b7 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/machine/hv_transformer.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine/hv_transformer.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " H ", - " M ", - " H " + "H", + "M", + "H" ], "key": { "H": { @@ -16,4 +16,4 @@ "result": { "item": "techreborn:hv_transformer" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine/mv_transformer.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/mv_transformer.json index cc7eb5d00..27ce41444 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/machine/mv_transformer.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine/mv_transformer.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " G ", - " M ", - " G " + "G", + "M", + "G" ], "key": { "G": { @@ -16,4 +16,4 @@ "result": { "item": "techreborn:mv_transformer" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine/wind_mill.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/wind_mill.json index 00f1b6424..aff1ce4f5 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/machine/wind_mill.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine/wind_mill.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " I ", - " G ", - " I " + "I", + "G", + "I" ], "key": { "G": { @@ -16,4 +16,4 @@ "result": { "item": "techreborn:wind_mill" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_frame_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_frame_alt.json new file mode 100644 index 000000000..37fc969b7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_frame_alt.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "A A", + "AAA" + ], + "key": { + "A": { + "item": "techreborn:refined_iron_storage_block" + } + }, + "result": { + "item": "techreborn:basic_machine_frame", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/gravel.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/gravel.json new file mode 100644 index 000000000..3115b4c6e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/gravel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "gravel", + "ingredients": [ + { + "tag": "c:andesite_dusts" + }, + { + "tag": "c:diorite_dusts" + }, + { + "tag": "c:granite_dusts" + }, + { + "item": "minecraft:flint" + } + ], + "result": { + "item": "minecraft:gravel", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/sponge.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/sponge.json new file mode 100644 index 000000000..c272f2e04 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/sponge.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "###", + "###" + ], + "key": { + "#": { + "item": "techreborn:sponge_piece" + } + }, + "result": { + "item": "minecraft:sponge" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_grass_variants.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_grass_variants.json new file mode 100644 index 000000000..2c47d4899 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_grass_variants.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "plantball", + "ingredients": [ + { + "tag": "c:grass_variants" + }, + { + "tag": "c:grass_variants" + }, + { + "tag": "c:grass_variants" + }, + { + "tag": "c:grass_variants" + }, + { + "tag": "c:grass_variants" + }, + { + "tag": "c:grass_variants" + }, + { + "tag": "c:grass_variants" + }, + { + "tag": "c:grass_variants" + }, + { + "tag": "c:grass_variants" + } + ], + "result": { + "item": "techreborn:plantball" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_kelp.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_kelp.json new file mode 100644 index 000000000..d1fffd253 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_kelp.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XXX", + " X " + ], + "key": { + "X": { + "item": "minecraft:kelp" + } + }, + "result": { + "item": "techreborn:plantball" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_leaves.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_leaves.json new file mode 100644 index 000000000..fcbf427fd --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_leaves.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "plantball", + "ingredients": [ + { + "tag": "minecraft:leaves" + }, + { + "tag": "minecraft:leaves" + }, + { + "tag": "minecraft:leaves" + }, + { + "tag": "minecraft:leaves" + }, + { + "tag": "minecraft:leaves" + }, + { + "tag": "minecraft:leaves" + }, + { + "tag": "minecraft:leaves" + }, + { + "tag": "minecraft:leaves" + }, + { + "tag": "minecraft:leaves" + } + ], + "result": { + "item": "techreborn:plantball" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_saplings.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_saplings.json new file mode 100644 index 000000000..13b7f022d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_saplings.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "plantball", + "ingredients": [ + { + "tag": "minecraft:saplings" + }, + { + "tag": "minecraft:saplings" + }, + { + "tag": "minecraft:saplings" + }, + { + "tag": "minecraft:saplings" + }, + { + "tag": "minecraft:saplings" + }, + { + "tag": "minecraft:saplings" + }, + { + "tag": "minecraft:saplings" + }, + { + "tag": "minecraft:saplings" + }, + { + "tag": "minecraft:saplings" + } + ], + "result": { + "item": "techreborn:plantball", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_sugar_cane.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_sugar_cane.json new file mode 100644 index 000000000..cace6d592 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/plantball_from_sugar_cane.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XXX", + " X " + ], + "key": { + "X": { + "item": "minecraft:sugar_cane" + } + }, + "result": { + "item": "techreborn:plantball" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_iridium_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_iridium_storage_block.json new file mode 100644 index 000000000..e1ab0e7b9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_iridium_storage_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "AAA", + "AAA" + ], + "key": { + "A": { + "item": "techreborn:raw_iridium" + } + }, + "result": { + "item": "techreborn:raw_iridium_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_lead_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_lead_storage_block.json new file mode 100644 index 000000000..5dc478558 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_lead_storage_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "AAA", + "AAA" + ], + "key": { + "A": { + "item": "techreborn:raw_lead" + } + }, + "result": { + "item": "techreborn:raw_lead_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_silver_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_silver_storage_block.json new file mode 100644 index 000000000..abde9febc --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_silver_storage_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "AAA", + "AAA" + ], + "key": { + "A": { + "item": "techreborn:raw_silver" + } + }, + "result": { + "item": "techreborn:raw_silver_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_tin_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_tin_storage_block.json new file mode 100644 index 000000000..e81137ff9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_tin_storage_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "AAA", + "AAA" + ], + "key": { + "A": { + "item": "techreborn:raw_tin" + } + }, + "result": { + "item": "techreborn:raw_tin_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_tungsten_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_tungsten_storage_block.json new file mode 100644 index 000000000..658ae3846 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/raw_tungsten_storage_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "AAA", + "AAA" + ], + "key": { + "A": { + "item": "techreborn:raw_tungsten" + } + }, + "result": { + "item": "techreborn:raw_tungsten_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json b/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json index ffbc71483..2ea726331 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json @@ -7,7 +7,7 @@ ], "key": { "B": { - "item": "minecraft:barrel" + "tag": "blockus:barrels" }, "P": { "item": "minecraft:paper" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit_blockus.json b/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit_blockus.json deleted file mode 100644 index 22e1b0c34..000000000 --- a/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit_blockus.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "WWW", - "WBW", - "WPW" - ], - - "key": { - "B": { - "tag": "blockus:barrels" - }, - "P": { - "item": "minecraft:paper" - }, - "W": { - "tag": "minecraft:planks" - } - }, - - "result": { - "item": "techreborn:crude_storage_unit" - }, - - "conditions": { - "reborncore:mod": "blockus" - } -} diff --git a/src/main/resources/data/techreborn/recipes/extractor/black_dye_from_wither_rose.json b/src/main/resources/data/techreborn/recipes/extractor/black_dye_from_wither_rose.json new file mode 100644 index 000000000..f7ef37848 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/black_dye_from_wither_rose.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:wither_rose" + } + ], + "results": [ + { + "item": "minecraft:black_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/blue_dye_from_coral_block.json b/src/main/resources/data/techreborn/recipes/extractor/blue_dye_from_coral_block.json new file mode 100644 index 000000000..50e3bdc11 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/blue_dye_from_coral_block.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 400, + "ingredients": [ + { + "item": "minecraft:tube_coral_block" + } + ], + "results": [ + { + "item": "minecraft:blue_dye", + "count": 5 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/blue_dye_from_small_coral.json b/src/main/resources/data/techreborn/recipes/extractor/blue_dye_from_small_coral.json new file mode 100644 index 000000000..6d313160a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/blue_dye_from_small_coral.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 200, + "ingredients": [ + { + "tag": "c:small_corals_blue" + } + ], + "results": [ + { + "item": "minecraft:blue_dye", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/cyan_dye.json b/src/main/resources/data/techreborn/recipes/extractor/cyan_dye.json new file mode 100644 index 000000000..398650948 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/cyan_dye.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:prismarine_shard" + } + ], + "results": [ + { + "item": "minecraft:cyan_dye" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/gray_dye_from_coral_block.json b/src/main/resources/data/techreborn/recipes/extractor/gray_dye_from_coral_block.json new file mode 100644 index 000000000..a3a3e43ec --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/gray_dye_from_coral_block.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 400, + "ingredients": [ + { + "tag": "c:dead_coral_blocks" + } + ], + "results": [ + { + "item": "minecraft:gray_dye", + "count": 5 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/gray_dye_from_small_coral.json b/src/main/resources/data/techreborn/recipes/extractor/gray_dye_from_small_coral.json new file mode 100644 index 000000000..4462be0b7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/gray_dye_from_small_coral.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 200, + "ingredients": [ + { + "tag": "c:small_corals_dead" + } + ], + "results": [ + { + "item": "minecraft:gray_dye", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/green_dye.json b/src/main/resources/data/techreborn/recipes/extractor/green_dye.json new file mode 100644 index 000000000..17957259b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/green_dye.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "techreborn:plantball" + } + ], + "results": [ + { + "item": "minecraft:green_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/heart_of_the_sea.json b/src/main/resources/data/techreborn/recipes/extractor/heart_of_the_sea.json new file mode 100644 index 000000000..9620a0e44 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/heart_of_the_sea.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 1000, + "ingredients": [ + { + "item": "minecraft:conduit" + } + ], + "results": [ + { + "item": "minecraft:heart_of_the_sea" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/orange_dye_from_carrot.json b/src/main/resources/data/techreborn/recipes/extractor/orange_dye_from_carrot.json new file mode 100644 index 000000000..036258746 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/orange_dye_from_carrot.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:carrot", + "count": 3 + } + ], + "results": [ + { + "item": "minecraft:orange_dye" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/orange_dye_from_glow_berries.json b/src/main/resources/data/techreborn/recipes/extractor/orange_dye_from_glow_berries.json new file mode 100644 index 000000000..f98a1228a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/orange_dye_from_glow_berries.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:glow_berries", + "count": 4 + } + ], + "results": [ + { + "item": "minecraft:orange_dye" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_coral_block.json b/src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_coral_block.json new file mode 100644 index 000000000..8c65129af --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_coral_block.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 400, + "ingredients": [ + { + "item": "minecraft:brain_coral_block" + } + ], + "results": [ + { + "item": "minecraft:pink_dye", + "count": 5 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_small_coral.json b/src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_small_coral.json new file mode 100644 index 000000000..4bf22eb33 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_small_coral.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 200, + "ingredients": [ + { + "tag": "c:small_corals_pink" + } + ], + "results": [ + { + "item": "minecraft:pink_dye", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/purple_dye_from_coral_block.json b/src/main/resources/data/techreborn/recipes/extractor/purple_dye_from_coral_block.json new file mode 100644 index 000000000..3ff7dd5f8 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/purple_dye_from_coral_block.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 400, + "ingredients": [ + { + "item": "minecraft:bubble_coral_block" + } + ], + "results": [ + { + "item": "minecraft:purple_dye", + "count": 5 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/purple_dye_from_small_coral.json b/src/main/resources/data/techreborn/recipes/extractor/purple_dye_from_small_coral.json new file mode 100644 index 000000000..fde1aa45f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/purple_dye_from_small_coral.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 200, + "ingredients": [ + { + "tag": "c:small_corals_purple" + } + ], + "results": [ + { + "item": "minecraft:purple_dye", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_beetroot.json b/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_beetroot.json new file mode 100644 index 000000000..3f4cb9a6c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_beetroot.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:beetroot" + } + ], + "results": [ + { + "item": "minecraft:red_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_coral_block.json b/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_coral_block.json new file mode 100644 index 000000000..47cc0dfea --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_coral_block.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 400, + "ingredients": [ + { + "item": "minecraft:fire_coral_block" + } + ], + "results": [ + { + "item": "minecraft:red_dye", + "count": 5 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_small_coral.json b/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_small_coral.json new file mode 100644 index 000000000..eed37a192 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_small_coral.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 200, + "ingredients": [ + { + "tag": "c:small_corals_red" + } + ], + "results": [ + { + "item": "minecraft:red_dye", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_sweet_berries.json b/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_sweet_berries.json new file mode 100644 index 000000000..a9fc9f428 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_sweet_berries.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:sweet_berries", + "count": 4 + } + ], + "results": [ + { + "item": "minecraft:red_dye" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/rooted_dirt.json b/src/main/resources/data/techreborn/recipes/extractor/rooted_dirt.json new file mode 100644 index 000000000..c0e2b0dc6 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/rooted_dirt.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:rooted_dirt" + } + ], + "results": [ + { + "item": "minecraft:hanging_roots", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/sponge_piece.json b/src/main/resources/data/techreborn/recipes/extractor/sponge_piece.json new file mode 100644 index 000000000..b5dec6b8a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/sponge_piece.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 1000, + "ingredients" : [ + { + "item": "minecraft:cod", + "count": 64 + } + ], + "results" : [ + { + "item": "techreborn:sponge_piece" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/stick.json b/src/main/resources/data/techreborn/recipes/extractor/stick.json index 28f01b8d1..64a785f3d 100644 --- a/src/main/resources/data/techreborn/recipes/extractor/stick.json +++ b/src/main/resources/data/techreborn/recipes/extractor/stick.json @@ -9,7 +9,8 @@ ], "results": [ { - "item": "minecraft:stick" + "item": "minecraft:stick", + "count": 2 } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_coral_block.json b/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_coral_block.json new file mode 100644 index 000000000..78ff50687 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_coral_block.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 400, + "ingredients": [ + { + "item": "minecraft:horn_coral_block" + } + ], + "results": [ + { + "item": "minecraft:yellow_dye", + "count": 5 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_small_coral.json b/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_small_coral.json new file mode 100644 index 000000000..ffd7adcfc --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_small_coral.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 200, + "ingredients": [ + { + "tag": "c:small_corals_yellow" + } + ], + "results": [ + { + "item": "minecraft:yellow_dye", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_sunflower.json b/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_sunflower.json index b93924ae6..d43f4b317 100644 --- a/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_sunflower.json +++ b/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_sunflower.json @@ -10,7 +10,7 @@ "results": [ { "item": "minecraft:yellow_dye", - "count": 2 + "count": 4 } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/amethyst_dust.json b/src/main/resources/data/techreborn/recipes/grinder/amethyst_dust.json new file mode 100644 index 000000000..4cffe4dc0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/amethyst_dust.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:grinder", + "power": 4, + "time": 270, + "ingredients": [ + { + "item": "minecraft:amethyst_block" + } + ], + "results": [ + { + "item": "techreborn:amethyst_dust", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust.json new file mode 100644 index 000000000..f3897fa64 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 400, + "ingredients" : [ + { + "item": "minecraft:calcite" + } + ], + "results" : [ + { + "item": "techreborn:calcite_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_conduit.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_conduit.json new file mode 100644 index 000000000..cb4e186ed --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_conduit.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 500, + "ingredients" : [ + { + "item": "minecraft:conduit" + } + ], + "results" : [ + { + "item": "techreborn:calcite_dust", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_coral_blocks.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_coral_blocks.json new file mode 100644 index 000000000..c68d5ea64 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_coral_blocks.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 400, + "ingredients" : [ + { + "tag": "c:coral_blocks" + } + ], + "results" : [ + { + "item": "techreborn:calcite_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_dripstone_block.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_dripstone_block.json new file mode 100644 index 000000000..e034498c2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_dust_from_dripstone_block.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 400, + "ingredients" : [ + { + "item": "minecraft:dripstone_block" + } + ], + "results" : [ + { + "item": "techreborn:calcite_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_bone_meal.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_bone_meal.json new file mode 100644 index 000000000..d7d511c12 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_bone_meal.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 100, + "ingredients" : [ + { + "item": "minecraft:bone_meal" + } + ], + "results" : [ + { + "item": "techreborn:calcite_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_fan.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_fan.json new file mode 100644 index 000000000..8de6c3f68 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_fan.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 100, + "ingredients" : [ + { + "tag": "c:coral_fans" + } + ], + "results" : [ + { + "item": "techreborn:calcite_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_plant.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_plant.json new file mode 100644 index 000000000..3c10915d7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_coral_plant.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 100, + "ingredients" : [ + { + "tag": "c:coral_plants" + } + ], + "results" : [ + { + "item": "techreborn:calcite_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_nautilus_shell.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_nautilus_shell.json new file mode 100644 index 000000000..ddc3de7e9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_nautilus_shell.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 100, + "ingredients" : [ + { + "item": "minecraft:nautilus_shell" + } + ], + "results" : [ + { + "item": "techreborn:calcite_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_pointed_dripstone.json b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_pointed_dripstone.json new file mode 100644 index 000000000..7ef38b7d9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/calcite_small_dust_from_pointed_dripstone.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 100, + "ingredients" : [ + { + "item": "minecraft:pointed_dripstone" + } + ], + "results" : [ + { + "item": "techreborn:calcite_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/certus_quartz_dust.json b/src/main/resources/data/techreborn/recipes/grinder/certus_quartz_dust.json index b186a907a..b955a8484 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/certus_quartz_dust.json +++ b/src/main/resources/data/techreborn/recipes/grinder/certus_quartz_dust.json @@ -10,10 +10,15 @@ ], "results": [ { - "item": "appliedenergistics2:certus_quartz_dust" + "item": "ae2:certus_quartz_dust" } ], - "conditions": { - "reborncore:mod": "appliedenergistics2" - } -} \ No newline at end of file + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "ae2" + ] + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/grinder/certus_quartz_dust_from_ore.json b/src/main/resources/data/techreborn/recipes/grinder/certus_quartz_dust_from_ore.json index 3b1fa1cee..e31be4f4d 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/certus_quartz_dust_from_ore.json +++ b/src/main/resources/data/techreborn/recipes/grinder/certus_quartz_dust_from_ore.json @@ -9,11 +9,16 @@ ], "results": [ { - "item": "appliedenergistics2:certus_quartz_dust", + "item": "ae2:certus_quartz_dust", "count": 5 } ], - "conditions": { - "reborncore:mod": "appliedenergistics2" - } -} \ No newline at end of file + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "ae2" + ] + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/grinder/fluix_dust.json b/src/main/resources/data/techreborn/recipes/grinder/fluix_dust.json index 60c459019..c68584d9e 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/fluix_dust.json +++ b/src/main/resources/data/techreborn/recipes/grinder/fluix_dust.json @@ -4,16 +4,21 @@ "time": 300, "ingredients": [ { - "item": "appliedenergistics2:fluix_crystal", + "item": "ae2:fluix_crystal", "count": 2 } ], "results": [ { - "item": "appliedenergistics2:fluix_dust" + "item": "ae2:fluix_dust" } ], - "conditions": { - "reborncore:mod": "appliedenergistics2" - } -} \ No newline at end of file + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "ae2" + ] + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/grinder/glowstone_small_dust_from_glow_berries.json b/src/main/resources/data/techreborn/recipes/grinder/glowstone_small_dust_from_glow_berries.json new file mode 100644 index 000000000..d793ec73b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/glowstone_small_dust_from_glow_berries.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 150, + "ingredients" : [ + { + "item": "minecraft:glow_berries", + "count": 4 + } + ], + "results" : [ + { + "item": "techreborn:glowstone_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/glowstone_small_dust_from_shroomlight.json b/src/main/resources/data/techreborn/recipes/grinder/glowstone_small_dust_from_shroomlight.json new file mode 100644 index 000000000..c852f4830 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/glowstone_small_dust_from_shroomlight.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 300, + "ingredients" : [ + { + "item": "minecraft:shroomlight" + } + ], + "results" : [ + { + "item": "techreborn:glowstone_small_dust", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/gravel.json b/src/main/resources/data/techreborn/recipes/grinder/gravel.json index 0d12856c5..88b74b10f 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/gravel.json +++ b/src/main/resources/data/techreborn/recipes/grinder/gravel.json @@ -4,7 +4,7 @@ "time": 180, "ingredients" : [ { - "item": "minecraft:cobblestone" + "tag": "minecraft:stone_tool_materials" } ], "results" : [ diff --git a/src/main/resources/data/techreborn/recipes/grinder/marble_dust_from_limestone.json b/src/main/resources/data/techreborn/recipes/grinder/marble_dust_from_limestone.json index 4356344dd..0362530d9 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/marble_dust_from_limestone.json +++ b/src/main/resources/data/techreborn/recipes/grinder/marble_dust_from_limestone.json @@ -14,8 +14,12 @@ "item": "techreborn:marble_dust" } ], - - "conditions": { - "reborncore:tag": "c:limestone" - } + "fabric:load_conditions": [ + { + "condition": "fabric:item_tags_populated", + "values": [ + "c:limestone" + ] + } + ] } diff --git a/src/main/resources/data/techreborn/recipes/grinder/marble_dust_from_marble.json b/src/main/resources/data/techreborn/recipes/grinder/marble_dust_from_marble.json index 9c418e2be..eea9c34dc 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/marble_dust_from_marble.json +++ b/src/main/resources/data/techreborn/recipes/grinder/marble_dust_from_marble.json @@ -14,8 +14,12 @@ "item": "techreborn:marble_dust" } ], - - "conditions": { - "reborncore:tag": "c:marble" - } + "fabric:load_conditions": [ + { + "condition": "fabric:item_tags_populated", + "values": [ + "c:marble" + ] + } + ] } diff --git a/src/main/resources/data/techreborn/recipes/grinder/netherrack_dust_from_crimson.json b/src/main/resources/data/techreborn/recipes/grinder/netherrack_dust_from_crimson.json new file mode 100644 index 000000000..0d82da40a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/netherrack_dust_from_crimson.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 4, + "time": 200, + "ingredients" : [ + { + "item": "minecraft:crimson_nylium" + } + ], + "results" : [ + { + "item": "techreborn:netherrack_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/netherrack_dust_from_warped.json b/src/main/resources/data/techreborn/recipes/grinder/netherrack_dust_from_warped.json new file mode 100644 index 000000000..745fff313 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/netherrack_dust_from_warped.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 4, + "time": 200, + "ingredients" : [ + { + "item": "minecraft:warped_nylium" + } + ], + "results" : [ + { + "item": "techreborn:netherrack_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals_from_sea_lantern.json b/src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals_from_sea_lantern.json new file mode 100644 index 000000000..7d0248018 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals_from_sea_lantern.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 400, + "ingredients" : [ + { + "item": "minecraft:sea_lantern" + } + ], + "results" : [ + { + "item": "minecraft:prismarine_crystals", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/prismarine_shards_from_prismarine.json b/src/main/resources/data/techreborn/recipes/grinder/prismarine_shards_from_prismarine.json new file mode 100644 index 000000000..6f1f6c889 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/prismarine_shards_from_prismarine.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 400, + "ingredients" : [ + { + "item": "minecraft:prismarine" + } + ], + "results" : [ + { + "item": "minecraft:prismarine_shard", + "count": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/prismarine_shards_from_prismarine_bricks.json b/src/main/resources/data/techreborn/recipes/grinder/prismarine_shards_from_prismarine_bricks.json new file mode 100644 index 000000000..4d6928fe3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/prismarine_shards_from_prismarine_bricks.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:grinder", + "power": 2, + "time": 400, + "ingredients" : [ + { + "item": "minecraft:prismarine_bricks" + } + ], + "results" : [ + { + "item": "minecraft:prismarine_shard", + "count": 7 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/sulfur_dust.json b/src/main/resources/data/techreborn/recipes/grinder/sulfur_dust.json index 3d960b000..b216235f1 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/sulfur_dust.json +++ b/src/main/resources/data/techreborn/recipes/grinder/sulfur_dust.json @@ -12,7 +12,12 @@ "item": "techreborn:sulfur_dust" } ], - "conditions": { - "reborncore:tag": "c:sulfurs" - } + "fabric:load_conditions": [ + { + "condition": "fabric:item_tags_populated", + "values": [ + "c:sulfurs" + ] + } + ] } diff --git a/src/main/resources/data/techreborn/recipes/grinder/sulfur_dust_from_ore.json b/src/main/resources/data/techreborn/recipes/grinder/sulfur_dust_from_ore.json index 4df4a42c6..1ea2d0ca3 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/sulfur_dust_from_ore.json +++ b/src/main/resources/data/techreborn/recipes/grinder/sulfur_dust_from_ore.json @@ -13,7 +13,12 @@ "count": 2 } ], - "conditions": { - "reborncore:tag": "c:sulfur_ores" - } + "fabric:load_conditions": [ + { + "condition": "fabric:item_tags_populated", + "values": [ + "c:sulfur_ores" + ] + } + ] } diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/amethyst_dust.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/amethyst_dust.json new file mode 100644 index 000000000..0227a0411 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/amethyst_dust.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 30, + "time": 2000, + "ingredients": [ + { + "count": 8, + "tag": "c:amethyst_dusts" + }, + { + "item": "minecraft:tnt", + "count": 16 + } + ], + "results": [ + { + "item": "minecraft:amethyst_shard", + "count": 16 + }, + { + "item": "techreborn:quartz_dust", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/amethyst_dust_alt.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/amethyst_dust_alt.json new file mode 100644 index 000000000..5ba190acb --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/amethyst_dust_alt.json @@ -0,0 +1,26 @@ + +{ + "type": "techreborn:implosion_compressor", + "power": 30, + "time": 2000, + "ingredients": [ + { + "count": 8, + "tag": "c:amethyst_dusts" + }, + { + "item": "minecraft:end_crystal", + "count": 4 + } + ], + "results": [ + { + "item": "minecraft:amethyst_shard", + "count": 16 + }, + { + "item": "techreborn:quartz_dust", + "count": 1 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json index 4ee7357cd..1a1d7f0f4 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json @@ -4,7 +4,7 @@ "time": 1000, "ingredients": [ { - "item": "minecraft:sand", + "tag": "minecraft:sand", "count": 16 }, { diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/certus_quartz_ore.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/certus_quartz_ore.json index 04b2a88e1..01dae0ded 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/certus_quartz_ore.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/certus_quartz_ore.json @@ -13,15 +13,20 @@ ], "results": [ { - "item": "appliedenergistics2:certus_quartz_crystal", + "item": "ae2:certus_quartz_crystal", "count": 2 }, { - "item": "appliedenergistics2:certus_quartz_dust", + "item": "ae2:certus_quartz_dust", "count": 5 } ], - "conditions": { - "reborncore:mod": "appliedenergistics2" - } -} \ No newline at end of file + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "ae2" + ] + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/heart_of_the_sea_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/heart_of_the_sea_with_mercury.json new file mode 100644 index 000000000..21bf202f2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/heart_of_the_sea_with_mercury.json @@ -0,0 +1,32 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 64, + "time": 100, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "item": "minecraft:heart_of_the_sea" + } + ], + "results": [ + { + "item": "techreborn:diamond_dust", + "count": 2 + }, + { + "item": "techreborn:titanium_dust", + "count": 2 + }, + { + "item": "techreborn:platinum_dust", + "count": 1 + }, + { + "item": "techreborn:raw_iridium", + "count": 1 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/heart_of_the_sea_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/heart_of_the_sea_with_water.json new file mode 100644 index 000000000..97aefd275 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/heart_of_the_sea_with_water.json @@ -0,0 +1,32 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 64, + "time": 100, + "tank": { + "fluid": "minecraft:water", + "amount": 1000 + }, + "ingredients": [ + { + "item": "minecraft:heart_of_the_sea" + } + ], + "results": [ + { + "item": "techreborn:diamond_small_dust", + "count": 3 + }, + { + "item": "techreborn:titanium_small_dust", + "count": 3 + }, + { + "item": "techreborn:platinum_small_dust", + "count": 2 + }, + { + "item": "techreborn:iridium_nugget", + "count": 3 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/magma_block_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/magma_block_with_water.json new file mode 100644 index 000000000..4f481ffa0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/magma_block_with_water.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 64, + "time": 250, + "tank": { + "fluid": "minecraft:water", + "amount": 2000 + }, + "ingredients": [ + { + "item": "minecraft:magma_block", + "count": 5 + } + ], + "results": [ + { + "item": "techreborn:obsidian_dust", + "count": 4 + }, + { + "item": "minecraft:magma_cream", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/copper_block_from_raw_by_blasting.json b/src/main/resources/data/techreborn/recipes/smelting/copper_block_from_raw_by_blasting.json new file mode 100644 index 000000000..b2c8a4864 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/copper_block_from_raw_by_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "minecraft:raw_copper_block" + }, + "result": "minecraft:copper_block", + "experience": 4.5, + "cookingtime": 750 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/gold_block_from_raw_by_blasting.json b/src/main/resources/data/techreborn/recipes/smelting/gold_block_from_raw_by_blasting.json new file mode 100644 index 000000000..e200b9b82 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/gold_block_from_raw_by_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "minecraft:raw_gold_block" + }, + "result": "minecraft:gold_block", + "experience": 4.5, + "cookingtime": 750 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/iron_block_from_raw_by_blasting.json b/src/main/resources/data/techreborn/recipes/smelting/iron_block_from_raw_by_blasting.json new file mode 100644 index 000000000..61da50e47 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/iron_block_from_raw_by_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "minecraft:raw_iron_block" + }, + "result": "minecraft:iron_block", + "experience": 4.5, + "cookingtime": 750 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/lead_block_from_raw_by_blasting.json b/src/main/resources/data/techreborn/recipes/smelting/lead_block_from_raw_by_blasting.json new file mode 100644 index 000000000..db634d753 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/lead_block_from_raw_by_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "techreborn:raw_lead_storage_block" + }, + "result": "techreborn:lead_storage_block", + "experience": 4.5, + "cookingtime": 750 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/refined_iron_block_by_blasting.json b/src/main/resources/data/techreborn/recipes/smelting/refined_iron_block_by_blasting.json new file mode 100644 index 000000000..f4f2687da --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/refined_iron_block_by_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "minecraft:iron_block" + }, + "result": "techreborn:refined_iron_storage_block", + "experience": 4.5, + "cookingtime": 750 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/silver_block_from_raw_by_blasting.json b/src/main/resources/data/techreborn/recipes/smelting/silver_block_from_raw_by_blasting.json new file mode 100644 index 000000000..7442ba2e2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/silver_block_from_raw_by_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "techreborn:raw_silver_storage_block" + }, + "result": "techreborn:silver_storage_block", + "experience": 4.5, + "cookingtime": 750 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/tin_block_from_raw_by_blasting.json b/src/main/resources/data/techreborn/recipes/smelting/tin_block_from_raw_by_blasting.json new file mode 100644 index 000000000..edc00b997 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/tin_block_from_raw_by_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "techreborn:raw_tin_storage_block" + }, + "result": "techreborn:tin_storage_block", + "experience": 4.5, + "cookingtime": 750 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/vacuum_freezer/blue_ice.json b/src/main/resources/data/techreborn/recipes/vacuum_freezer/blue_ice.json new file mode 100644 index 000000000..b4ea2eec8 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/vacuum_freezer/blue_ice.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:vacuum_freezer", + "power": 60, + "time": 64, + "ingredients": [ + { + "item": "minecraft:packed_ice", + "count": 4 + } + ], + "results": [ + { + "item": "minecraft:blue_ice" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/tags/items/ingots.json b/src/main/resources/data/techreborn/tags/items/ingots.json new file mode 100644 index 000000000..e6ae5827a --- /dev/null +++ b/src/main/resources/data/techreborn/tags/items/ingots.json @@ -0,0 +1,27 @@ +{ + "replace": false, + "values": [ + "techreborn:advanced_alloy_ingot", + "techreborn:aluminum_ingot", + "techreborn:brass_ingot", + "techreborn:bronze_ingot", + "techreborn:chrome_ingot", + "techreborn:electrum_ingot", + "techreborn:hot_tungstensteel_ingot", + "techreborn:invar_ingot", + "techreborn:iridium_alloy_ingot", + "techreborn:iridium_ingot", + "techreborn:lead_ingot", + "techreborn:mixed_metal_ingot", + "techreborn:nickel_ingot", + "techreborn:platinum_ingot", + "techreborn:refined_iron_ingot", + "techreborn:silver_ingot", + "techreborn:steel_ingot", + "techreborn:tin_ingot", + "techreborn:titanium_ingot", + "techreborn:tungsten_ingot", + "techreborn:tungstensteel_ingot", + "techreborn:zinc_ingot" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/tags/items/plantball_material.json b/src/main/resources/data/techreborn/tags/items/plantball_material.json new file mode 100755 index 000000000..63ead89cc --- /dev/null +++ b/src/main/resources/data/techreborn/tags/items/plantball_material.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "#minecraft:leaves", + "#minecraft:saplings", + "minecraft:beetroot", + "minecraft:carrot", + "minecraft:potato", + "minecraft:wheat", + "minecraft:melon", + "minecraft:sugar_cane", + "minecraft:cactus", + "minecraft:apple", + "minecraft:pumpkin", + "minecraft:kelp", + "minecraft:sweet_berries" + ] +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d4647abd9..b12dabec6 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,7 +34,7 @@ }, "depends": { "fabricloader": ">=0.12.0", - "fabric": ">=0.40.0", + "fabric": ">=0.46.1", "reborncore": "*", "team_reborn_energy": ">=2.0.0-beta1", "fabric-biome-api-v1": ">=3.0.0"