diff --git a/build.gradle b/build.gradle index de0b8acd9..62904964c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'net.neoforged.gradle.userdev' version '7.0.97' + id 'net.neoforged.gradle.userdev' version '7.0.145' id 'net.darkhax.curseforgegradle' version '1.0.8' id 'com.github.kt3k.coveralls' version '2.12.0' id 'com.diffplug.spotless' version '5.14.3' @@ -34,7 +34,7 @@ base { } // Set Java details -java.toolchain.languageVersion = JavaLanguageVersion.of(17) +java.toolchain.languageVersion = JavaLanguageVersion.of(21) compileJava.options.compilerArgs << "-Xmaxerrs" << "9999" println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) @@ -102,15 +102,16 @@ dependencies { } // Add something like 'integratedtunnelscompat_version_local=0.1.0-DEV' to your gradle.properties if you want to use a custom local Integrated Tunnels Compat version. - if(secrets.integratedtunnelscompat_version_local) { - shadow("org.cyclops.integratedtunnelscompat:integratedtunnelscompat-${project.minecraft_version}-neoforge:${secrets.integratedtunnelscompat_version_local}") { - transitive = false - } - } else { - shadow("org.cyclops.integratedtunnelscompat:integratedtunnelscompat-${project.minecraft_version}-neoforge:${project.integratedtunnelscompat_version}") { - transitive = false - } - } + // TODO +// if(secrets.integratedtunnelscompat_version_local) { +// shadow("org.cyclops.integratedtunnelscompat:integratedtunnelscompat-${project.minecraft_version}-neoforge:${secrets.integratedtunnelscompat_version_local}") { +// transitive = false +// } +// } else { +// shadow("org.cyclops.integratedtunnelscompat:integratedtunnelscompat-${project.minecraft_version}-neoforge:${project.integratedtunnelscompat_version}") { +// transitive = false +// } +// } if(secrets.commoncapabilities_version_local) { implementation "org.cyclops.commoncapabilities:commoncapabilities-${project.minecraft_version}-neoforge:${secrets.commoncapabilities_version_local}:deobf" @@ -126,10 +127,10 @@ dependencies { } // Project lombok - compileOnly 'org.projectlombok:lombok:1.18.22' - annotationProcessor 'org.projectlombok:lombok:1.18.22' - testCompileOnly 'org.projectlombok:lombok:1.18.22' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' + compileOnly 'org.projectlombok:lombok:1.18.30' + annotationProcessor 'org.projectlombok:lombok:1.18.30' + testCompileOnly 'org.projectlombok:lombok:1.18.30' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.30' testImplementation "junit:junit:4.12" } @@ -341,6 +342,8 @@ publishing { idea { module { + downloadSources = true + downloadJavadoc = true for (String excludeDirName in ["run", "out", "logs", "gradle"]) { File excludeDir = new File(projectDir, excludeDirName) excludeDirs.add(excludeDir) diff --git a/gradle.properties b/gradle.properties index 450a38a02..6e969e937 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ mod_id=integratedtunnels mod_version=1.8.25 -minecraft_version=1.20.4 -neoforge_version=20.4.160-beta -cyclopscore_version=1.19.0-423 -integrateddynamics_version=1.21.2-744 +minecraft_version=1.21 +neoforge_version=21.0.43-beta +cyclopscore_version=1.19.1-452 +integrateddynamics_version=1.21.4-770 integratedtunnelscompat_version=1.0.0-36 release_type=release fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44 -commoncapabilities_version=2.9.1-115 +commoncapabilities_version=2.9.1-126 # Workaround for Spotless bug # https://github.com/diffplug/spotless/issues/834 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..20db9ad5c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/org/cyclops/integratedtunnels/Capabilities.java b/src/main/java/org/cyclops/integratedtunnels/Capabilities.java index 56bd69215..d8332dba6 100644 --- a/src/main/java/org/cyclops/integratedtunnels/Capabilities.java +++ b/src/main/java/org/cyclops/integratedtunnels/Capabilities.java @@ -22,24 +22,24 @@ */ public class Capabilities { public static final class ItemNetwork { - public static final NetworkCapability NETWORK = NetworkCapability.create(new ResourceLocation(Reference.MOD_ID, "item_network"), IItemNetwork.class); + public static final NetworkCapability NETWORK = NetworkCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "item_network"), IItemNetwork.class); } public static final class ItemHandler { - public static final NetworkCapability NETWORK = NetworkCapability.create(new ResourceLocation(Reference.MOD_ID, "item_handler"), IItemHandler.class); - public static final PartCapability PART = PartCapability.create(new ResourceLocation(Reference.MOD_ID, "item_handler"), IItemHandler.class); + public static final NetworkCapability NETWORK = NetworkCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "item_handler"), IItemHandler.class); + public static final PartCapability PART = PartCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "item_handler"), IItemHandler.class); } public static final class SlotlessItemHandler { - public static final PartCapability PART = PartCapability.create(new ResourceLocation(Reference.MOD_ID, "slotless_item_handler"), ISlotlessItemHandler.class); + public static final PartCapability PART = PartCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "slotless_item_handler"), ISlotlessItemHandler.class); } public static final class FluidNetwork { - public static final NetworkCapability NETWORK = NetworkCapability.create(new ResourceLocation(Reference.MOD_ID, "fluid_network"), IFluidNetwork.class); + public static final NetworkCapability NETWORK = NetworkCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "fluid_network"), IFluidNetwork.class); } public static final class FluidHandler { - public static final NetworkCapability NETWORK = NetworkCapability.create(new ResourceLocation(Reference.MOD_ID, "fluid_handler"), IFluidHandler.class); - public static final PartCapability PART = PartCapability.create(new ResourceLocation(Reference.MOD_ID, "fluid_handler"), IFluidHandler.class); + public static final NetworkCapability NETWORK = NetworkCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "fluid_handler"), IFluidHandler.class); + public static final PartCapability PART = PartCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "fluid_handler"), IFluidHandler.class); } public static final class EnergyStorage { - public static final PartCapability PART = PartCapability.create(new ResourceLocation(Reference.MOD_ID, "energy_storage"), IEnergyStorage.class); + public static final PartCapability PART = PartCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "energy_storage"), IEnergyStorage.class); } public static void registerPartCapabilities(RegisterPartCapabilitiesEvent event) { diff --git a/src/main/java/org/cyclops/integratedtunnels/RegistryEntries.java b/src/main/java/org/cyclops/integratedtunnels/RegistryEntries.java index 022968ce7..25f2d69c1 100644 --- a/src/main/java/org/cyclops/integratedtunnels/RegistryEntries.java +++ b/src/main/java/org/cyclops/integratedtunnels/RegistryEntries.java @@ -13,9 +13,9 @@ */ public class RegistryEntries { - public static final DeferredHolder ITEM_PART_INTERFACE = DeferredHolder.create(Registries.ITEM, new ResourceLocation("integratedtunnels:part_interface_item")); - public static final DeferredHolder ITEM_DUMMY_PICKAXE = DeferredHolder.create(Registries.ITEM, new ResourceLocation("integratedtunnels:dummy_pickaxe")); + public static final DeferredHolder ITEM_PART_INTERFACE = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("integratedtunnels:part_interface_item")); + public static final DeferredHolder ITEM_DUMMY_PICKAXE = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("integratedtunnels:dummy_pickaxe")); - public static final DeferredHolder, MenuType> CONTAINER_INTERFACE_SETTINGS = DeferredHolder.create(Registries.MENU, new ResourceLocation("integratedtunnels:part_interface_settings")); + public static final DeferredHolder, MenuType> CONTAINER_INTERFACE_SETTINGS = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedtunnels:part_interface_settings")); } diff --git a/src/main/java/org/cyclops/integratedtunnels/core/FakeNetHandlerPlayServer.java b/src/main/java/org/cyclops/integratedtunnels/core/FakeNetHandlerPlayServer.java index 125859240..ba54bc2e4 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/FakeNetHandlerPlayServer.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/FakeNetHandlerPlayServer.java @@ -47,11 +47,6 @@ public void exceptionCaught(ChannelHandlerContext p_exceptionCaught_1_, Throwabl } - @Override - public void setListener(PacketListener handler) { - - } - @Override public void send(Packet packetIn) { @@ -87,11 +82,6 @@ public PacketListener getPacketListener() { return null; } - @Override - public Component getDisconnectedReason() { - return null; - } - @Override public void setReadOnly() { @@ -180,11 +170,6 @@ public void handlePaddleBoat(ServerboundPaddleBoatPacket packetIn) { } - @Override - public void onDisconnect(Component reason) { - - } - @Override public void send(final Packet packetIn) { diff --git a/src/main/java/org/cyclops/integratedtunnels/core/FluidHandlerBlock.java b/src/main/java/org/cyclops/integratedtunnels/core/FluidHandlerBlock.java index bdd978cd1..84ec0e17a 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/FluidHandlerBlock.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/FluidHandlerBlock.java @@ -42,7 +42,7 @@ public int getTanks() { public FluidStack getFluidInTank(int tank) { Block block = this.state.getBlock(); if (block instanceof LiquidBlock && this.state.getValue(LiquidBlock.LEVEL) == 0) { - return new FluidStack(((LiquidBlock) block).getFluid(), FluidHelpers.BUCKET_VOLUME); + return new FluidStack(((LiquidBlock) block).fluid, FluidHelpers.BUCKET_VOLUME); } else { return FluidStack.EMPTY; } @@ -70,7 +70,7 @@ public int fill(FluidStack resource, FluidAction action) { public FluidStack drain(FluidStack resource, FluidAction action) { Block block = this.state.getBlock(); if (block instanceof LiquidBlock - && ((LiquidBlock) block).getFluid() == resource.getFluid()) { + && ((LiquidBlock) block).fluid == resource.getFluid()) { return this.drain(resource.getAmount(), action); } return FluidStack.EMPTY; @@ -86,7 +86,7 @@ public FluidStack drain(int maxDrain, FluidAction action) { if (action.execute()) { this.world.setBlock(this.blockPos, Blocks.AIR.defaultBlockState(), 11); } - return new FluidStack(((LiquidBlock) block).getFluid(), FluidHelpers.BUCKET_VOLUME); + return new FluidStack(((LiquidBlock) block).fluid, FluidHelpers.BUCKET_VOLUME); } return FluidStack.EMPTY; } diff --git a/src/main/java/org/cyclops/integratedtunnels/core/ItemHandlerWorldEntityExportWrapper.java b/src/main/java/org/cyclops/integratedtunnels/core/ItemHandlerWorldEntityExportWrapper.java index 822cf52b4..5017a5001 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/ItemHandlerWorldEntityExportWrapper.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/ItemHandlerWorldEntityExportWrapper.java @@ -205,9 +205,9 @@ public boolean isEmpty() { } @Override - public int addItem(ItemStack stack) { + public ItemStack insertItem(ItemStack stack) { handleDispenseResult(this.dispenseResultHandler, this.blockSource.get(), stack); - return 0; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/org/cyclops/integratedtunnels/core/ItemStoragePlayerWrapper.java b/src/main/java/org/cyclops/integratedtunnels/core/ItemStoragePlayerWrapper.java index 7c9dc62f4..c86655bec 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/ItemStoragePlayerWrapper.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/ItemStoragePlayerWrapper.java @@ -1,16 +1,22 @@ package org.cyclops.integratedtunnels.core; +import com.google.common.collect.HashMultimap; import com.google.common.collect.Iterators; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.Holder; import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; @@ -18,9 +24,8 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import net.neoforged.bus.api.Event; import net.neoforged.neoforge.common.CommonHooks; -import net.neoforged.neoforge.common.NeoForgeMod; +import net.neoforged.neoforge.common.util.TriState; import net.neoforged.neoforge.event.EventHooks; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent; @@ -147,7 +152,7 @@ public ItemStack insert(@Nonnull ItemStack stack, boolean simulate) { } // Use item first - if (rightClickBlockActionResult.getUseItem() != Event.Result.DENY) { + if (rightClickBlockActionResult.getUseItem() != TriState.FALSE) { if (!stack.isEmpty()) { UseOnContext itemUseContext = new UseOnContext(player, hand, blockRayTraceResult); InteractionResult actionResult = stack.getItem().onItemUseFirst(stack, itemUseContext); @@ -166,14 +171,22 @@ public ItemStack insert(@Nonnull ItemStack stack, boolean simulate) { boolean flag1 = (player.isSecondaryUseActive() && playerHasHeldItem) && !(player.getMainHandItem().doesSneakBypassUse(world, pos, player) && player.getOffhandItem().doesSneakBypassUse(world, pos, player)); - if (rightClickBlockActionResult.getUseBlock() == Event.Result.ALLOW - || (rightClickBlockActionResult.getUseBlock() != Event.Result.DENY && !flag1)) { + if (rightClickBlockActionResult.getUseBlock() == TriState.TRUE + || (rightClickBlockActionResult.getUseBlock() != TriState.FALSE && !flag1)) { BlockState blockState = world.getBlockState(pos); if (!player.isCrouching() || stack.isEmpty()) { - if (blockState.use(world, player, hand, blockRayTraceResult).consumesAction()) { + ItemInteractionResult iteminteractionresult = blockState.useItemOn(player.getItemInHand(hand), world, player, hand, blockRayTraceResult); + if (iteminteractionresult.consumesAction()) { returnPlayerInventory(player); return ItemStack.EMPTY; } + + if (iteminteractionresult == ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION && hand == InteractionHand.MAIN_HAND) { + if (blockState.useWithoutItem(world, player, blockRayTraceResult).consumesAction()) { + returnPlayerInventory(player); + return ItemStack.EMPTY; + } + } } } @@ -191,7 +204,7 @@ public ItemStack insert(@Nonnull ItemStack stack, boolean simulate) { } // Use itemstack - if (rightClickBlockActionResult.getUseItem() != Event.Result.DENY && !stack.isEmpty()) { + if (rightClickBlockActionResult.getUseItem() != TriState.FALSE && !stack.isEmpty()) { InteractionResult cancelResult = CommonHooks.onItemRightClick(player, hand); if (cancelResult != null) { if (cancelResult == InteractionResult.FAIL) { @@ -226,10 +239,10 @@ public ItemStack insert(@Nonnull ItemStack stack, boolean simulate) { } // Use item - if (rightClickBlockActionResult.getUseItem() != Event.Result.DENY && !stack.isEmpty()) { + if (rightClickBlockActionResult.getUseItem() != TriState.FALSE && !stack.isEmpty()) { // Increase reach position. BlockPos targetPos = pos; - double reachDistance = player.getAttribute(NeoForgeMod.BLOCK_REACH.value()).getValue() + 3; + double reachDistance = player.getAttribute(Attributes.BLOCK_INTERACTION_RANGE).getValue() + 3; int i = 0; while (i++ < reachDistance && world.isEmptyBlock(targetPos)) { targetPos = targetPos.relative(side.getOpposite()); @@ -252,7 +265,7 @@ public ItemStack insert(@Nonnull ItemStack stack, boolean simulate) { // Check if left clicking is allowed PlayerInteractEvent.LeftClickBlock event = CommonHooks.onLeftClickBlock(player, pos, side, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK); BlockState blockState = world.getBlockState(pos); - if (event.isCanceled() || (event.getUseItem() == Event.Result.DENY)) { // Restore block and te data + if (event.isCanceled() || (event.getUseItem() == TriState.FALSE)) { // Restore block and te data world.sendBlockUpdated(pos, blockState, world.getBlockState(pos), 3); return stack; } @@ -290,9 +303,11 @@ public ItemStack insert(@Nonnull ItemStack stack, boolean simulate) { if (entities.size() > 0) { Entity entity = getEntity(entities); EquipmentSlot equipmentSlotType = hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND; - player.getAttributes().addTransientAttributeModifiers(stack.getAttributeModifiers(equipmentSlotType)); + HashMultimap, AttributeModifier> modifiers = HashMultimap.create(); + stack.getAttributeModifiers().forEach(equipmentSlotType, modifiers::put); + player.getAttributes().addTransientAttributeModifiers(modifiers); player.attack(entity); - player.getAttributes().removeAttributeModifiers(stack.getAttributeModifiers(equipmentSlotType)); + player.getAttributes().removeAttributeModifiers(modifiers); returnPlayerInventory(player); return ItemStack.EMPTY; } else { diff --git a/src/main/java/org/cyclops/integratedtunnels/core/TunnelFluidHelpers.java b/src/main/java/org/cyclops/integratedtunnels/core/TunnelFluidHelpers.java index c2d3f945f..1820dda92 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/TunnelFluidHelpers.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/TunnelFluidHelpers.java @@ -30,6 +30,7 @@ import org.cyclops.integratedtunnels.part.aspect.ITunnelConnection; import javax.annotation.Nullable; +import java.util.Objects; import java.util.Optional; /** @@ -66,7 +67,7 @@ public boolean test(FluidStack input) { protected static int getFluidStackMatchFlags(final boolean checkFluid, final boolean checkAmount, final boolean checkNbt) { int matchFlags = FluidMatch.ANY; if (checkFluid) matchFlags = matchFlags | FluidMatch.FLUID; - if (checkNbt) matchFlags = matchFlags | FluidMatch.TAG; + if (checkNbt) matchFlags = matchFlags | FluidMatch.DATA; if (checkAmount) matchFlags = matchFlags | FluidMatch.AMOUNT; return matchFlags; } @@ -110,7 +111,7 @@ public static boolean areFluidStackEqual(FluidStack stackA, FluidStack stackB, if (stackA != null && stackB != null) { if (checkAmount && stackA.getAmount() != stackB.getAmount()) return false; if (checkFluid && stackA.getFluid() != stackB.getFluid()) return false; - if (checkNbt && !FluidStack.areFluidStackTagsEqual(stackA, stackB)) return false; + if (checkNbt && !Objects.equals(stackA.getComponents(), stackB.getComponents())) return false; return true; } return false; @@ -189,7 +190,7 @@ public static FluidStack prototypeWithCount(FluidStack prototype, int count) { if (prototype == null) { return count == 0 ? null : new FluidStack(Fluids.WATER, count); } else { - prototype = new FluidStack(prototype, count); + prototype = new FluidStack(prototype.getFluidHolder(), count, prototype.getComponentsPatch()); } } return prototype; diff --git a/src/main/java/org/cyclops/integratedtunnels/core/TunnelItemHelpers.java b/src/main/java/org/cyclops/integratedtunnels/core/TunnelItemHelpers.java index 6e6f49150..1288940e6 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/TunnelItemHelpers.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/TunnelItemHelpers.java @@ -71,7 +71,7 @@ public boolean test(ItemStack input) { protected static int getItemStackMatchFlags(boolean checkItem, boolean checkStackSize, boolean checkNbt) { int matchFlags = ItemMatch.ANY; if (checkItem) matchFlags = matchFlags | ItemMatch.ITEM; - if (checkNbt) matchFlags = matchFlags | ItemMatch.TAG; + if (checkNbt) matchFlags = matchFlags | ItemMatch.DATA; if (checkStackSize) matchFlags = matchFlags | ItemMatch.STACKSIZE; return matchFlags; } @@ -130,7 +130,7 @@ public static boolean areItemStackEqual(ItemStack stackA, ItemStack stackB, if (stackA != null && stackB != null) { if (checkStackSize && stackA.getCount() != stackB.getCount()) return false; if (checkItem && stackA.getItem() != stackB.getItem()) return false; - if (checkNbt && !(Objects.equals(stackA.getTag(), stackB.getTag()) && stackA.areAttachmentsCompatible(stackB))) return false; + if (checkNbt && !(Objects.equals(stackA.getComponents(), stackB.getComponents()))) return false; return true; } return false; diff --git a/src/main/java/org/cyclops/integratedtunnels/core/part/ContainerInterfaceSettings.java b/src/main/java/org/cyclops/integratedtunnels/core/part/ContainerInterfaceSettings.java index a4263e505..fa458b6a2 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/part/ContainerInterfaceSettings.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/part/ContainerInterfaceSettings.java @@ -1,10 +1,10 @@ package org.cyclops.integratedtunnels.core.part; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.Container; import net.minecraft.world.SimpleContainer; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.player.Inventory; import org.cyclops.cyclopscore.helper.ValueNotifierHelpers; import org.cyclops.integrateddynamics.api.part.IPartContainer; import org.cyclops.integrateddynamics.api.part.IPartType; @@ -23,7 +23,7 @@ public class ContainerInterfaceSettings extends ContainerPartSettings { private final int lastChannelInterfaceValueId; - public ContainerInterfaceSettings(int id, Inventory playerInventory, FriendlyByteBuf packetBuffer) { + public ContainerInterfaceSettings(int id, Inventory playerInventory, RegistryFriendlyByteBuf packetBuffer) { this(id, playerInventory, new SimpleContainer(0), PartHelpers.readPartTarget(packetBuffer), Optional.empty(), PartHelpers.readPart(packetBuffer)); } diff --git a/src/main/java/org/cyclops/integratedtunnels/core/part/ContainerScreenInterfaceSettings.java b/src/main/java/org/cyclops/integratedtunnels/core/part/ContainerScreenInterfaceSettings.java index 88ecb5905..5dcba7ccf 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/part/ContainerScreenInterfaceSettings.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/part/ContainerScreenInterfaceSettings.java @@ -31,7 +31,7 @@ public ContainerScreenInterfaceSettings(ContainerInterfaceSettings container, In @Override protected ResourceLocation constructGuiTexture() { - return new ResourceLocation(Reference.MOD_ID, "textures/gui/part_interface_settings.png"); + return ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/part_interface_settings.png"); } @Override diff --git a/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeInterfacePositionedAddon.java b/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeInterfacePositionedAddon.java index e72133223..9ae01a266 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeInterfacePositionedAddon.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeInterfacePositionedAddon.java @@ -4,7 +4,7 @@ import net.minecraft.core.Vec3i; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.MenuProvider; @@ -72,7 +72,7 @@ public AbstractContainerMenu createMenu(int id, Inventory playerInventory, Playe } @Override - public void writeExtraGuiData(FriendlyByteBuf packetBuffer, PartPos pos, ServerPlayer player) { + public void writeExtraGuiData(RegistryFriendlyByteBuf packetBuffer, PartPos pos, ServerPlayer player) { PacketCodec.write(packetBuffer, pos); packetBuffer.writeUtf(this.getUniqueName().toString()); } @@ -176,8 +176,8 @@ public void readFromNBT(ValueDeseralizationContext valueDeseralizationContext, C } @Override - public void writeToNBT(CompoundTag tag) { - super.writeToNBT(tag); + public void writeToNBT(ValueDeseralizationContext valueDeseralizationContext, CompoundTag tag) { + super.writeToNBT(valueDeseralizationContext, tag); tag.putInt("channelInterface", channelInterface); } diff --git a/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeInterfacePositionedAddonFiltering.java b/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeInterfacePositionedAddonFiltering.java index 7826dbe9f..76a140db3 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeInterfacePositionedAddonFiltering.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeInterfacePositionedAddonFiltering.java @@ -162,8 +162,8 @@ public void readFromNBT(ValueDeseralizationContext valueDeseralizationContext, C } @Override - public void writeToNBT(CompoundTag tag) { - super.writeToNBT(tag); + public void writeToNBT(ValueDeseralizationContext valueDeseralizationContext, CompoundTag tag) { + super.writeToNBT(valueDeseralizationContext, tag); tag.putInt("channelInterface", channelInterface); } diff --git a/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeTunnel.java b/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeTunnel.java index bbd403c3a..bedafc337 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeTunnel.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/part/PartTypeTunnel.java @@ -1,6 +1,6 @@ package org.cyclops.integratedtunnels.core.part; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.MenuProvider; @@ -79,7 +79,7 @@ public AbstractContainerMenu createMenu(int id, Inventory playerInventory, Playe } @Override - public void writeExtraGuiDataOffsets(FriendlyByteBuf packetBuffer, PartPos pos, ServerPlayer player) { + public void writeExtraGuiDataOffsets(RegistryFriendlyByteBuf packetBuffer, PartPos pos, ServerPlayer player) { PacketCodec.write(packetBuffer, pos); packetBuffer.writeUtf(this.getUniqueName().toString()); } diff --git a/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateFluidStackNbt.java b/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateFluidStackNbt.java index aeab4a175..41442f6f0 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateFluidStackNbt.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateFluidStackNbt.java @@ -1,8 +1,11 @@ package org.cyclops.integratedtunnels.core.predicate; +import net.minecraft.core.component.DataComponentPatch; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtOps; import net.minecraft.nbt.Tag; import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.server.ServerLifecycleHooks; import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent; import org.cyclops.integrateddynamics.core.helper.NbtHelpers; @@ -32,10 +35,10 @@ public IngredientPredicateFluidStackNbt(boolean blacklist, int amount, boolean e @Override public boolean test(@Nullable FluidStack input) { - if (input.hasTag() && requireNbt) { + if (input.getComponents().isEmpty() && requireNbt) { return isBlacklist(); } - CompoundTag itemTag = input.hasTag() ? input.getTag() : new CompoundTag(); + CompoundTag itemTag = (CompoundTag) DataComponentPatch.CODEC.encodeStart(ServerLifecycleHooks.getCurrentServer().registryAccess().createSerializationContext(NbtOps.INSTANCE), input.getComponentsPatch()).getOrThrow(); boolean ret = (!subset || tag.map(t -> NbtHelpers.nbtMatchesSubset(t, itemTag, recursive)).orElse(false) && (!superset || tag.map(t -> NbtHelpers.nbtMatchesSubset(itemTag, t, recursive)).orElse(false))); if (blacklist) { diff --git a/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateItemStackNbt.java b/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateItemStackNbt.java index 0395e9555..8f54969b0 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateItemStackNbt.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateItemStackNbt.java @@ -1,8 +1,11 @@ package org.cyclops.integratedtunnels.core.predicate; +import net.minecraft.core.component.DataComponentPatch; +import net.minecraft.nbt.NbtOps; import net.minecraft.world.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; +import net.neoforged.neoforge.server.ServerLifecycleHooks; import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent; import org.cyclops.integrateddynamics.core.helper.NbtHelpers; @@ -32,10 +35,10 @@ public IngredientPredicateItemStackNbt(boolean blacklist, int amount, boolean ex @Override public boolean test(@Nullable ItemStack input) { - if (!input.hasTag() && requireNbt) { + if (input.getComponents().isEmpty() && requireNbt) { return isBlacklist(); } - CompoundTag itemTag = input.hasTag() ? input.getTag() : new CompoundTag(); + CompoundTag itemTag = (CompoundTag) DataComponentPatch.CODEC.encodeStart(ServerLifecycleHooks.getCurrentServer().registryAccess().createSerializationContext(NbtOps.INSTANCE), input.getComponentsPatch()).getOrThrow(); boolean ret = (!subset || tag.map(t -> NbtHelpers.nbtMatchesSubset(t, itemTag, recursive)).orElse(false) && (!superset || tag.map(t -> NbtHelpers.nbtMatchesSubset(itemTag, t, recursive)).orElse(false))); if (blacklist) { diff --git a/src/main/java/org/cyclops/integratedtunnels/core/world/BlockBreakHandlerShulkerBox.java b/src/main/java/org/cyclops/integratedtunnels/core/world/BlockBreakHandlerShulkerBox.java index c72140557..6d254d8dc 100644 --- a/src/main/java/org/cyclops/integratedtunnels/core/world/BlockBreakHandlerShulkerBox.java +++ b/src/main/java/org/cyclops/integratedtunnels/core/world/BlockBreakHandlerShulkerBox.java @@ -1,14 +1,15 @@ package org.cyclops.integratedtunnels.core.world; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.ShulkerBoxBlock; +import net.minecraft.core.BlockPos; +import net.minecraft.core.NonNullList; +import net.minecraft.core.component.DataComponents; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.ShulkerBoxBlock; import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity; import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity; -import net.minecraft.core.NonNullList; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; import org.cyclops.cyclopscore.helper.BlockEntityHelpers; import org.cyclops.integratedtunnels.api.world.IBlockBreakHandler; @@ -28,10 +29,10 @@ public NonNullList getDrops(BlockState blockState, Level world, Block .map(tile -> { if (!tile.isEmpty()) { ItemStack itemStack = ShulkerBoxBlock.getColoredItemStack(tile.getColor()); - tile.saveToItem(itemStack); + tile.saveToItem(itemStack, world.registryAccess()); if (tile.hasCustomName()) { - itemStack.setHoverName(tile.getName()); + itemStack.set(DataComponents.CUSTOM_NAME, tile.getName()); } NonNullList list = NonNullList.create(); diff --git a/src/main/java/org/cyclops/integratedtunnels/item/ItemDummyPickAxe.java b/src/main/java/org/cyclops/integratedtunnels/item/ItemDummyPickAxe.java index c3370da46..bec545825 100644 --- a/src/main/java/org/cyclops/integratedtunnels/item/ItemDummyPickAxe.java +++ b/src/main/java/org/cyclops/integratedtunnels/item/ItemDummyPickAxe.java @@ -1,13 +1,15 @@ package org.cyclops.integratedtunnels.item; import com.google.common.collect.Maps; +import net.minecraft.core.registries.Registries; import net.minecraft.tags.BlockTags; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.item.DiggerItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.DiggerItem; +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.server.ServerLifecycleHooks; import org.cyclops.integratedtunnels.RegistryEntries; import java.util.Map; @@ -22,12 +24,7 @@ public class ItemDummyPickAxe extends DiggerItem { private static final Map ITEMSTACKS = Maps.newHashMap(); public ItemDummyPickAxe(Item.Properties properties) { - super(1000, 1000, Tiers.DIAMOND, BlockTags.MINEABLE_WITH_PICKAXE, properties); - } - - @Override - public boolean isCorrectToolForDrops(BlockState blockIn) { - return true; + super(Tiers.DIAMOND, BlockTags.MINEABLE_WITH_PICKAXE, properties); } @Override @@ -40,10 +37,10 @@ public static ItemStack getItemStack(boolean silkTouch, int fortune) { return ITEMSTACKS.computeIfAbsent(data, (key) -> { ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_DUMMY_PICKAXE, 1); if (silkTouch) { - itemStack.enchant(Enchantments.SILK_TOUCH, 1); + itemStack.enchant(ServerLifecycleHooks.getCurrentServer().registryAccess().registry(Registries.ENCHANTMENT).get().getHolderOrThrow(Enchantments.SILK_TOUCH), 1); } if (fortune > 0) { - itemStack.enchant(Enchantments.BLOCK_FORTUNE, fortune); + itemStack.enchant(ServerLifecycleHooks.getCurrentServer().registryAccess().registry(Registries.ENCHANTMENT).get().getHolderOrThrow(Enchantments.FORTUNE), fortune); } return itemStack; }); diff --git a/src/main/java/org/cyclops/integratedtunnels/part/PartStateFluid.java b/src/main/java/org/cyclops/integratedtunnels/part/PartStateFluid.java index bbcb5955c..91c1f6cfa 100644 --- a/src/main/java/org/cyclops/integratedtunnels/part/PartStateFluid.java +++ b/src/main/java/org/cyclops/integratedtunnels/part/PartStateFluid.java @@ -68,7 +68,7 @@ public boolean isFluidValid(int tank, @Nonnull FluidStack stack) { protected FluidStack rateLimitFluid(FluidStack fluidStack) { if (fluidStack != null && fluidStack.getAmount() > GeneralConfig.fluidRateLimit) { - return new FluidStack(fluidStack, GeneralConfig.fluidRateLimit); + return new FluidStack(fluidStack.getFluidHolder(), GeneralConfig.fluidRateLimit, fluidStack.getComponentsPatch()); } return fluidStack; } diff --git a/src/main/java/org/cyclops/integratedtunnels/part/aspect/TunnelAspects.java b/src/main/java/org/cyclops/integratedtunnels/part/aspect/TunnelAspects.java index 5d96c9236..d46d47560 100644 --- a/src/main/java/org/cyclops/integratedtunnels/part/aspect/TunnelAspects.java +++ b/src/main/java/org/cyclops/integratedtunnels/part/aspect/TunnelAspects.java @@ -61,7 +61,7 @@ public static final class Item { .buildRead(); static { Operators.REGISTRY.registerSerializer(new PositionedOperator.Serializer( - PositionedOperatorIngredientIndexItem.class, new ResourceLocation(Reference.MOD_ID, "positioned_ingredient_index_item"))); + PositionedOperatorIngredientIndexItem.class, ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "positioned_ingredient_index_item"))); } } @@ -99,7 +99,7 @@ public static final class Fluid { .buildRead(); static { Operators.REGISTRY.registerSerializer(new PositionedOperator.Serializer( - PositionedOperatorIngredientIndexFluid.class, new ResourceLocation(Reference.MOD_ID, "positioned_ingredient_index_fluid"))); + PositionedOperatorIngredientIndexFluid.class, ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "positioned_ingredient_index_fluid"))); } } diff --git a/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/TunnelValueTypeListProxyFactories.java b/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/TunnelValueTypeListProxyFactories.java index 3675e6da6..e25b0593a 100644 --- a/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/TunnelValueTypeListProxyFactories.java +++ b/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/TunnelValueTypeListProxyFactories.java @@ -18,10 +18,10 @@ public class TunnelValueTypeListProxyFactories { public static void load() { if (POSITIONED_ITEM_NETWORK == null) { POSITIONED_ITEM_NETWORK = ValueTypeListProxyFactories.REGISTRY.register(new ValueTypeListProxyNBTFactory<>( - new ResourceLocation(Reference.MOD_ID, "positioned_item_network"), + ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "positioned_item_network"), ValueTypeListProxyPositionedItemNetwork.class)); POSITIONED_FLUID_NETWORK = ValueTypeListProxyFactories.REGISTRY.register(new ValueTypeListProxyNBTFactory<>( - new ResourceLocation(Reference.MOD_ID, "positioned_fluid_network"), + ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "positioned_fluid_network"), ValueTypeListProxyPositionedFluidNetwork.class)); } } diff --git a/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/ValueTypeListProxyPositionedFluidNetwork.java b/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/ValueTypeListProxyPositionedFluidNetwork.java index 3eb030d8f..ef7cd508f 100644 --- a/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/ValueTypeListProxyPositionedFluidNetwork.java +++ b/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/ValueTypeListProxyPositionedFluidNetwork.java @@ -2,6 +2,7 @@ import com.google.common.collect.Iterators; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.neoforged.neoforge.fluids.FluidStack; import org.cyclops.cyclopscore.datastructure.DimPos; @@ -34,14 +35,16 @@ public ValueTypeListProxyPositionedFluidNetwork() { this(null, null, 0); } - public void writeGeneratedFieldsToNBT(CompoundTag tag) { - super.writeGeneratedFieldsToNBT(tag); - NBTClassType.writeNbt(Integer.class, "channel", this.channel, tag); + @Override + public void writeGeneratedFieldsToNBT(CompoundTag tag, HolderLookup.Provider holderLookupProvider) { + super.writeGeneratedFieldsToNBT(tag, holderLookupProvider); + NBTClassType.writeNbt(Integer.class, "channel", this.channel, tag, holderLookupProvider); } - public void readGeneratedFieldsFromNBT(CompoundTag tag) { - super.readGeneratedFieldsFromNBT(tag); - this.channel = NBTClassType.readNbt(Integer.class, "channel", tag); + @Override + public void readGeneratedFieldsFromNBT(CompoundTag tag, HolderLookup.Provider holderLookupProvider) { + super.readGeneratedFieldsFromNBT(tag, holderLookupProvider); + this.channel = NBTClassType.readNbt(Integer.class, "channel", tag, holderLookupProvider); } protected Optional> getChannelIndex() { diff --git a/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/ValueTypeListProxyPositionedItemNetwork.java b/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/ValueTypeListProxyPositionedItemNetwork.java index f5d89ea00..43c469b4b 100644 --- a/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/ValueTypeListProxyPositionedItemNetwork.java +++ b/src/main/java/org/cyclops/integratedtunnels/part/aspect/listproxy/ValueTypeListProxyPositionedItemNetwork.java @@ -2,6 +2,7 @@ import com.google.common.collect.Iterators; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import org.cyclops.cyclopscore.datastructure.DimPos; @@ -34,14 +35,16 @@ public ValueTypeListProxyPositionedItemNetwork() { this(null, null, 0); } - public void writeGeneratedFieldsToNBT(CompoundTag tag) { - super.writeGeneratedFieldsToNBT(tag); - NBTClassType.writeNbt(Integer.class, "channel", this.channel, tag); + @Override + public void writeGeneratedFieldsToNBT(CompoundTag tag, HolderLookup.Provider holderLookupProvider) { + super.writeGeneratedFieldsToNBT(tag, holderLookupProvider); + NBTClassType.writeNbt(Integer.class, "channel", this.channel, tag, holderLookupProvider); } - public void readGeneratedFieldsFromNBT(CompoundTag tag) { - super.readGeneratedFieldsFromNBT(tag); - this.channel = NBTClassType.readNbt(Integer.class, "channel", tag); + @Override + public void readGeneratedFieldsFromNBT(CompoundTag tag, HolderLookup.Provider holderLookupProvider) { + super.readGeneratedFieldsFromNBT(tag, holderLookupProvider); + this.channel = NBTClassType.readNbt(Integer.class, "channel", tag, holderLookupProvider); } protected Optional> getChannelIndex() { diff --git a/src/main/java/org/cyclops/integratedtunnels/part/aspect/operator/PositionedOperatorIngredientIndex.java b/src/main/java/org/cyclops/integratedtunnels/part/aspect/operator/PositionedOperatorIngredientIndex.java index e504ba0ab..c904c73d5 100644 --- a/src/main/java/org/cyclops/integratedtunnels/part/aspect/operator/PositionedOperatorIngredientIndex.java +++ b/src/main/java/org/cyclops/integratedtunnels/part/aspect/operator/PositionedOperatorIngredientIndex.java @@ -1,6 +1,7 @@ package org.cyclops.integratedtunnels.part.aspect.operator; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import org.cyclops.cyclopscore.datastructure.DimPos; import org.cyclops.cyclopscore.persist.nbt.NBTClassType; @@ -31,14 +32,16 @@ public PositionedOperatorIngredientIndex(String name, PositionedOperatorIngredie ((PositionedOperatorIngredientIndex.Function) this.getFunction()).setOperator(this); } - public void writeGeneratedFieldsToNBT(CompoundTag tag) { - super.writeGeneratedFieldsToNBT(tag); - NBTClassType.writeNbt(Integer.class, "channel", this.channel, tag); + @Override + public void writeGeneratedFieldsToNBT(CompoundTag tag, HolderLookup.Provider holderLookupProvider) { + super.writeGeneratedFieldsToNBT(tag, holderLookupProvider); + NBTClassType.writeNbt(Integer.class, "channel", this.channel, tag, holderLookupProvider); } - public void readGeneratedFieldsFromNBT(CompoundTag tag) { - super.readGeneratedFieldsFromNBT(tag); - this.channel = NBTClassType.readNbt(Integer.class, "channel", tag); + @Override + public void readGeneratedFieldsFromNBT(CompoundTag tag, HolderLookup.Provider holderLookupProvider) { + super.readGeneratedFieldsFromNBT(tag, holderLookupProvider); + this.channel = NBTClassType.readNbt(Integer.class, "channel", tag, holderLookupProvider); } @Override diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/neoforge.mods.toml similarity index 88% rename from src/main/resources/META-INF/mods.toml rename to src/main/resources/META-INF/neoforge.mods.toml index 8b6536b92..f1921cd80 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -18,30 +18,30 @@ Transfer other stuff over Integrated Dynamics networks. [[dependencies.integratedtunnels]] modId="cyclopscore" type="required" - versionRange="[1.19.0,)" + versionRange="[1.19.1,)" ordering="NONE" side="BOTH" [[dependencies.integratedtunnels]] modId="integrateddynamics" type="required" - versionRange="[1.21.0,)" + versionRange="[1.21.4,)" ordering="NONE" side="BOTH" [[dependencies.integratedtunnels]] modId="commoncapabilities" type="required" - versionRange="[2.9.0,)" + versionRange="[2.9.1,)" ordering="NONE" side="BOTH" [[dependencies.integratedtunnels]] modId="neoforge" type="required" - versionRange="[20.4,)" + versionRange="[21.0.43-beta,)" ordering="NONE" side="BOTH" [[dependencies.integratedtunnels]] modId="minecraft" type="required" - versionRange="[1.20.4,]" + versionRange="[1.21,]" ordering="NONE" side="BOTH" diff --git a/src/main/resources/data/integratedtunnels/advancements/break_stone/break_stone.json b/src/main/resources/data/integratedtunnels/advancement/break_stone/break_stone.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/break_stone/break_stone.json rename to src/main/resources/data/integratedtunnels/advancement/break_stone/break_stone.json diff --git a/src/main/resources/data/integratedtunnels/advancements/click_sword/click_sword.json b/src/main/resources/data/integratedtunnels/advancement/click_sword/click_sword.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/click_sword/click_sword.json rename to src/main/resources/data/integratedtunnels/advancement/click_sword/click_sword.json diff --git a/src/main/resources/data/integratedtunnels/advancements/click_sword/player_simulator.json b/src/main/resources/data/integratedtunnels/advancement/click_sword/player_simulator.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/click_sword/player_simulator.json rename to src/main/resources/data/integratedtunnels/advancement/click_sword/player_simulator.json diff --git a/src/main/resources/data/integratedtunnels/advancements/drop_all_items/drop_all_items.json b/src/main/resources/data/integratedtunnels/advancement/drop_all_items/drop_all_items.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/drop_all_items/drop_all_items.json rename to src/main/resources/data/integratedtunnels/advancement/drop_all_items/drop_all_items.json diff --git a/src/main/resources/data/integratedtunnels/advancements/export_enchantable_items/export_enchantable_items.json b/src/main/resources/data/integratedtunnels/advancement/export_enchantable_items/export_enchantable_items.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/export_enchantable_items/export_enchantable_items.json rename to src/main/resources/data/integratedtunnels/advancement/export_enchantable_items/export_enchantable_items.json diff --git a/src/main/resources/data/integratedtunnels/advancements/export_items_limit/export_items_limit.json b/src/main/resources/data/integratedtunnels/advancement/export_items_limit/export_items_limit.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/export_items_limit/export_items_limit.json rename to src/main/resources/data/integratedtunnels/advancement/export_items_limit/export_items_limit.json diff --git a/src/main/resources/data/integratedtunnels/advancements/filter_storage_day/filter_storage_day.json b/src/main/resources/data/integratedtunnels/advancement/filter_storage_day/filter_storage_day.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/filter_storage_day/filter_storage_day.json rename to src/main/resources/data/integratedtunnels/advancement/filter_storage_day/filter_storage_day.json diff --git a/src/main/resources/data/integratedtunnels/advancements/filter_storage_mod/filter_storage_mod.json b/src/main/resources/data/integratedtunnels/advancement/filter_storage_mod/filter_storage_mod.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/filter_storage_mod/filter_storage_mod.json rename to src/main/resources/data/integratedtunnels/advancement/filter_storage_mod/filter_storage_mod.json diff --git a/src/main/resources/data/integratedtunnels/advancements/import_all_items/import_all_items.json b/src/main/resources/data/integratedtunnels/advancement/import_all_items/import_all_items.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/import_all_items/import_all_items.json rename to src/main/resources/data/integratedtunnels/advancement/import_all_items/import_all_items.json diff --git a/src/main/resources/data/integratedtunnels/advancements/import_items_list/import_items_list.json b/src/main/resources/data/integratedtunnels/advancement/import_items_list/import_items_list.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/import_items_list/import_items_list.json rename to src/main/resources/data/integratedtunnels/advancement/import_items_list/import_items_list.json diff --git a/src/main/resources/data/integratedtunnels/advancements/importer_exporter/exporter_item.json b/src/main/resources/data/integratedtunnels/advancement/importer_exporter/exporter_item.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/importer_exporter/exporter_item.json rename to src/main/resources/data/integratedtunnels/advancement/importer_exporter/exporter_item.json diff --git a/src/main/resources/data/integratedtunnels/advancements/importer_exporter/importer_item.json b/src/main/resources/data/integratedtunnels/advancement/importer_exporter/importer_item.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/importer_exporter/importer_item.json rename to src/main/resources/data/integratedtunnels/advancement/importer_exporter/importer_item.json diff --git a/src/main/resources/data/integratedtunnels/advancements/interfaces/interface_energy.json b/src/main/resources/data/integratedtunnels/advancement/interfaces/interface_energy.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/interfaces/interface_energy.json rename to src/main/resources/data/integratedtunnels/advancement/interfaces/interface_energy.json diff --git a/src/main/resources/data/integratedtunnels/advancements/interfaces/interface_fluid.json b/src/main/resources/data/integratedtunnels/advancement/interfaces/interface_fluid.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/interfaces/interface_fluid.json rename to src/main/resources/data/integratedtunnels/advancement/interfaces/interface_fluid.json diff --git a/src/main/resources/data/integratedtunnels/advancements/interfaces/interface_item.json b/src/main/resources/data/integratedtunnels/advancement/interfaces/interface_item.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/interfaces/interface_item.json rename to src/main/resources/data/integratedtunnels/advancement/interfaces/interface_item.json diff --git a/src/main/resources/data/integratedtunnels/advancements/pickup_items_limit/pickup_items_limit.json b/src/main/resources/data/integratedtunnels/advancement/pickup_items_limit/pickup_items_limit.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/pickup_items_limit/pickup_items_limit.json rename to src/main/resources/data/integratedtunnels/advancement/pickup_items_limit/pickup_items_limit.json diff --git a/src/main/resources/data/integratedtunnels/advancements/place_logwood/place_logwood.json b/src/main/resources/data/integratedtunnels/advancement/place_logwood/place_logwood.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/place_logwood/place_logwood.json rename to src/main/resources/data/integratedtunnels/advancement/place_logwood/place_logwood.json diff --git a/src/main/resources/data/integratedtunnels/advancements/root.json b/src/main/resources/data/integratedtunnels/advancement/root.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/root.json rename to src/main/resources/data/integratedtunnels/advancement/root.json diff --git a/src/main/resources/data/integratedtunnels/advancements/world_importer_exporter/exporter_block.json b/src/main/resources/data/integratedtunnels/advancement/world_importer_exporter/exporter_block.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/world_importer_exporter/exporter_block.json rename to src/main/resources/data/integratedtunnels/advancement/world_importer_exporter/exporter_block.json diff --git a/src/main/resources/data/integratedtunnels/advancements/world_importer_exporter/exporter_item.json b/src/main/resources/data/integratedtunnels/advancement/world_importer_exporter/exporter_item.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/world_importer_exporter/exporter_item.json rename to src/main/resources/data/integratedtunnels/advancement/world_importer_exporter/exporter_item.json diff --git a/src/main/resources/data/integratedtunnels/advancements/world_importer_exporter/importer_block.json b/src/main/resources/data/integratedtunnels/advancement/world_importer_exporter/importer_block.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/world_importer_exporter/importer_block.json rename to src/main/resources/data/integratedtunnels/advancement/world_importer_exporter/importer_block.json diff --git a/src/main/resources/data/integratedtunnels/advancements/world_importer_exporter/importer_item.json b/src/main/resources/data/integratedtunnels/advancement/world_importer_exporter/importer_item.json similarity index 100% rename from src/main/resources/data/integratedtunnels/advancements/world_importer_exporter/importer_item.json rename to src/main/resources/data/integratedtunnels/advancement/world_importer_exporter/importer_item.json diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_energy.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_energy.json similarity index 81% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_energy.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_energy.json index 16bb11365..6141301d7 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_energy.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_energy.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_exporter_energy" + "id": "integratedtunnels:part_exporter_energy" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_fluid.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_fluid.json similarity index 81% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_fluid.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_fluid.json index f7d5ba032..af552d915 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_fluid.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_fluid.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_exporter_fluid" + "id": "integratedtunnels:part_exporter_fluid" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_item.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_item.json similarity index 81% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_item.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_item.json index 68076fb3b..d5bf8b75e 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_item.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_item.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_exporter_item" + "id": "integratedtunnels:part_exporter_item" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_block.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_block.json similarity index 82% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_block.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_block.json index ac57c8158..dc2d13459 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_block.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_block.json @@ -12,6 +12,6 @@ } ], "result": { - "item": "integratedtunnels:part_exporter_world_block" + "id": "integratedtunnels:part_exporter_world_block" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_energy.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_energy.json similarity index 78% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_energy.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_energy.json index e6f975496..9562365e4 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_energy.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_energy.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_exporter_world_energy" + "id": "integratedtunnels:part_exporter_world_energy" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_fluid.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_fluid.json similarity index 78% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_fluid.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_fluid.json index 85737cacd..5f19635e4 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_fluid.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_fluid.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_exporter_world_fluid" + "id": "integratedtunnels:part_exporter_world_fluid" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_item.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_item.json similarity index 79% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_item.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_item.json index bea5b96ce..8713b8173 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_exporter_world_item.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_exporter_world_item.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_exporter_world_item" + "id": "integratedtunnels:part_exporter_world_item" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_energy.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_energy.json similarity index 81% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_energy.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_energy.json index feb899859..3539ce291 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_energy.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_energy.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_importer_energy" + "id": "integratedtunnels:part_importer_energy" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_fluid.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_fluid.json similarity index 81% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_fluid.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_fluid.json index ade2d6768..eadb32b25 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_fluid.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_fluid.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_importer_fluid" + "id": "integratedtunnels:part_importer_fluid" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_item.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_item.json similarity index 81% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_item.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_item.json index 4ceba5506..c17cf9fd7 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_item.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_item.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_importer_item" + "id": "integratedtunnels:part_importer_item" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_block.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_block.json similarity index 82% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_block.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_block.json index ddda59d42..5e32b40d6 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_block.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_block.json @@ -12,6 +12,6 @@ } ], "result": { - "item": "integratedtunnels:part_importer_world_block" + "id": "integratedtunnels:part_importer_world_block" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_energy.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_energy.json similarity index 78% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_energy.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_energy.json index 6c651a068..865922792 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_energy.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_energy.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_importer_world_energy" + "id": "integratedtunnels:part_importer_world_energy" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_fluid.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_fluid.json similarity index 78% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_fluid.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_fluid.json index 5d1b843ec..e6d512cd0 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_fluid.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_fluid.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_importer_world_fluid" + "id": "integratedtunnels:part_importer_world_fluid" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_item.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_item.json similarity index 79% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_item.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_item.json index 82a131520..bfeafd5c3 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_importer_world_item.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_importer_world_item.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "integratedtunnels:part_importer_world_item" + "id": "integratedtunnels:part_importer_world_item" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_energy.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_energy.json similarity index 83% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_energy.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_energy.json index 82d478d12..ab2113c66 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_energy.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_energy.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "integratedtunnels:part_interface_energy", + "id": "integratedtunnels:part_interface_energy", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_filter_energy.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_filter_energy.json similarity index 81% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_filter_energy.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_filter_energy.json index d69e8b299..186d458c7 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_filter_energy.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_filter_energy.json @@ -12,6 +12,6 @@ } ], "result": { - "item": "integratedtunnels:part_interface_filter_energy" + "id": "integratedtunnels:part_interface_filter_energy" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_filter_fluid.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_filter_fluid.json similarity index 81% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_filter_fluid.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_filter_fluid.json index 1a53cb495..316326c83 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_filter_fluid.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_filter_fluid.json @@ -12,6 +12,6 @@ } ], "result": { - "item": "integratedtunnels:part_interface_filter_fluid" + "id": "integratedtunnels:part_interface_filter_fluid" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_filter_item.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_filter_item.json similarity index 81% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_filter_item.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_filter_item.json index 5e496f301..aa015c44a 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_filter_item.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_filter_item.json @@ -12,6 +12,6 @@ } ], "result": { - "item": "integratedtunnels:part_interface_filter_item" + "id": "integratedtunnels:part_interface_filter_item" } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_fluid.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_fluid.json similarity index 82% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_fluid.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_fluid.json index 84d1e5849..88eb179a0 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_fluid.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_fluid.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "integratedtunnels:part_interface_fluid", + "id": "integratedtunnels:part_interface_fluid", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_item.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_item.json similarity index 72% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_item.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_item.json index 313fe72b6..c4fc1fbe8 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_interface_item.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_interface_item.json @@ -9,11 +9,11 @@ "item": "integrateddynamics:crystalized_menril_chunk" }, "T": { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" } }, "result": { - "item": "integratedtunnels:part_interface_item", + "id": "integratedtunnels:part_interface_item", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/integratedtunnels/recipes/crafting/part_player_simulator.json b/src/main/resources/data/integratedtunnels/recipe/crafting/part_player_simulator.json similarity index 83% rename from src/main/resources/data/integratedtunnels/recipes/crafting/part_player_simulator.json rename to src/main/resources/data/integratedtunnels/recipe/crafting/part_player_simulator.json index 9c30eb087..34a7f3c9d 100644 --- a/src/main/resources/data/integratedtunnels/recipes/crafting/part_player_simulator.json +++ b/src/main/resources/data/integratedtunnels/recipe/crafting/part_player_simulator.json @@ -18,10 +18,10 @@ "item": "integratedtunnels:part_exporter_world_block" }, "X": { - "tag": "forge:gems/emerald" + "tag": "c:gems/emerald" } }, "result": { - "item": "integratedtunnels:part_player_simulator" + "id": "integratedtunnels:part_player_simulator" } } \ No newline at end of file