diff --git a/build.gradle b/build.gradle index b596a06aa..5fbae8f58 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.162' + id 'net.neoforged.gradle.userdev' version '7.0.165' } tasks.named('wrapper', Wrapper).configure { distributionType = Wrapper.DistributionType.BIN } diff --git a/gradle.properties b/gradle.properties index d031b2909..d9d5f0f6e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ emi_version=1.1.12 mod_id=deeperdarker mod_name=Deeper and Darker mod_license=AGPL-3.0 -mod_version=1.3.2 +mod_version=1.3.4 mod_group_id=com.kyanite.deeperdarker mod_authors=Kyanite Team mod_credits=NewJumperr, nitro_dynamite18, angxdd, pr_ib, JustJussi, Rotch_Gwylt, DanielArtist diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 9528f5ee5..8e26b02ae 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,8 +1,8 @@ -// 1.21 2024-10-10T21:20:28.0250668 Registries +// 1.21 2024-11-06T14:48:57.830265 Registries 65c8c67a4ec7ef0ce6846fb2f4d921cc6ceb02e2 data/deeperdarker/damage_type/bite.json 0b65c61bd1e5086d0f3685566cc6cecf6e324516 data/deeperdarker/damage_type/ring.json dede162345c14db637f3dd9a20ca9319e037ae9d data/deeperdarker/dimension/otherside.json -67f8cd0621b1c3614da8c1910f6b7bcb61660293 data/deeperdarker/dimension_type/otherside.json +0f715fda6f60117cf74eadf94c1590aea34761a3 data/deeperdarker/dimension_type/otherside.json ad453d5b708fe189495a8e5d4ce2531d9898a555 data/deeperdarker/enchantment/catalysis.json d5b5b78cce29a3e1eec213a0d1540c21d58a3d34 data/deeperdarker/enchantment/sculk_smite.json 729673e1d51f7ee33e7f94cff8b59ee030844d8b data/deeperdarker/painting_variant/abstraction.json diff --git a/src/generated/resources/.cache/5e6a331e51b12074ee68391963c1cb803c27d050 b/src/generated/resources/.cache/5e6a331e51b12074ee68391963c1cb803c27d050 index 84ea2f5f1..33643a11b 100644 --- a/src/generated/resources/.cache/5e6a331e51b12074ee68391963c1cb803c27d050 +++ b/src/generated/resources/.cache/5e6a331e51b12074ee68391963c1cb803c27d050 @@ -1,2 +1,2 @@ -// 1.21 2024-08-26T18:36:59.6353817 Languages: en_us for mod: deeperdarker -5314038eb99a4542981b40ccf14cfcec0f4fb07e assets/deeperdarker/lang/en_us.json +// 1.21 2024-09-13T23:51:44.7054691 Languages: en_us for mod: deeperdarker +6132e96471df232a0f1f9146e582eefc5ffaa47d assets/deeperdarker/lang/en_us.json diff --git a/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 b/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 index cd2de41b9..fc9fa7e8e 100644 --- a/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 +++ b/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 @@ -1,4 +1,4 @@ -// 1.21 2024-09-03T18:26:51.3070092 Tags for minecraft:item mod id deeperdarker +// 1.21 2024-10-17T10:27:49.2110636 Tags for minecraft:item mod id deeperdarker 9d236ad52ffab14efb6405a34d837dafff77e363 data/c/tags/item/ores.json ec4e45d46ce1593f9bb4b226a1e3d143bc0942c6 data/c/tags/item/ores/coal.json dc2be5311ef04baad7565936ffafc6dcea324cf1 data/c/tags/item/ores/copper.json @@ -23,7 +23,7 @@ ec4e45d46ce1593f9bb4b226a1e3d143bc0942c6 data/minecraft/tags/item/coal_ores.json dc2be5311ef04baad7565936ffafc6dcea324cf1 data/minecraft/tags/item/copper_ores.json 84c6024e42063deecc27f59b5a97328b415f4a05 data/minecraft/tags/item/diamond_ores.json 41a0ed1cf9fcf4b0f4e41d3155f010eb069e2edc data/minecraft/tags/item/emerald_ores.json -d0b6527a3244189c04b06295e1dc213419922973 data/minecraft/tags/item/enchantable/durability.json +7b02b576df083630e66072bf2d0f07f1e6ac4a26 data/minecraft/tags/item/enchantable/durability.json d0b6527a3244189c04b06295e1dc213419922973 data/minecraft/tags/item/enchantable/equippable.json 7dbce4cb80be16ec44f3472f112147a1d7ba8e61 data/minecraft/tags/item/fence_gates.json 81a54dc6ee81c739615aa27a3e28b941ba65077e data/minecraft/tags/item/flowers.json diff --git a/src/generated/resources/assets/deeperdarker/lang/en_us.json b/src/generated/resources/assets/deeperdarker/lang/en_us.json index f55d62fe8..3408c2706 100644 --- a/src/generated/resources/assets/deeperdarker/lang/en_us.json +++ b/src/generated/resources/assets/deeperdarker/lang/en_us.json @@ -292,6 +292,7 @@ "tag.item.deeperdarker.bloom_stems": "Blooming Stems", "tag.item.deeperdarker.dampens_vibrations": "Dampens Vibrations", "tag.item.deeperdarker.echo_logs": "Echo Logs", + "tag.item.deeperdarker.resonarium_armor": "Resonarium Armor", "tag.item.deeperdarker.scutes": "Scutes", "tooltips.deeperdarker.crystallized_amber.item": "Contains %s", "tooltips.deeperdarker.crystallized_amber.leech": "Contains Sculk Leech", diff --git a/src/generated/resources/data/deeperdarker/dimension_type/otherside.json b/src/generated/resources/data/deeperdarker/dimension_type/otherside.json index 80e44eda9..2ca3fa2f5 100644 --- a/src/generated/resources/data/deeperdarker/dimension_type/otherside.json +++ b/src/generated/resources/data/deeperdarker/dimension_type/otherside.json @@ -2,7 +2,7 @@ "ambient_light": 0.05, "bed_works": true, "coordinate_scale": 1.0, - "effects": "minecraft:the_nether", + "effects": "deeperdarker:otherside_effects", "fixed_time": 18000, "has_ceiling": true, "has_raids": false, diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json b/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json index bf2c5564f..753c1e308 100644 --- a/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json @@ -1,5 +1,6 @@ { "values": [ - "deeperdarker:soul_elytra" + "deeperdarker:soul_elytra", + "deeperdarker:sonorous_staff" ] } \ No newline at end of file diff --git a/src/main/java/com/kyanite/deeperdarker/DeeperDarkerEvents.java b/src/main/java/com/kyanite/deeperdarker/DeeperDarkerEvents.java index 1917eff60..e4a2ed7c2 100644 --- a/src/main/java/com/kyanite/deeperdarker/DeeperDarkerEvents.java +++ b/src/main/java/com/kyanite/deeperdarker/DeeperDarkerEvents.java @@ -16,9 +16,11 @@ import com.kyanite.deeperdarker.network.UseTransmitterPacket; import com.kyanite.deeperdarker.util.DDArmorMaterials; import com.kyanite.deeperdarker.util.DDTags; +import com.kyanite.deeperdarker.world.otherside.OthersideDimension; import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.minecraft.client.model.BoatModel; import net.minecraft.client.model.ChestBoatModel; +import net.minecraft.client.renderer.DimensionSpecialEffects; import net.minecraft.client.renderer.Sheets; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; import net.minecraft.client.renderer.blockentity.HangingSignRenderer; @@ -66,6 +68,7 @@ import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.neoforge.client.event.EntityRenderersEvent; import net.neoforged.neoforge.client.event.InputEvent; +import net.neoforged.neoforge.client.event.RegisterDimensionSpecialEffectsEvent; import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent; import net.neoforged.neoforge.event.AnvilUpdateEvent; import net.neoforged.neoforge.event.brewing.RegisterBrewingRecipesEvent; @@ -288,6 +291,11 @@ public static void clientSetup(final FMLClientSetupEvent event) { EntityRenderers.register(DDEntities.STALKER.get(), StalkerRenderer::new); } + @SubscribeEvent + public static void registerDimensionEffects(final RegisterDimensionSpecialEffectsEvent event) { + event.register(OthersideDimension.OTHERSIDE_EFFECTS, new DimensionSpecialEffects.NetherEffects()); + } + @SubscribeEvent public static void registerKeybinds(final RegisterKeyMappingsEvent event) { event.register(Keybinds.BOOST); diff --git a/src/main/java/com/kyanite/deeperdarker/content/blocks/OthersidePortalBlock.java b/src/main/java/com/kyanite/deeperdarker/content/blocks/OthersidePortalBlock.java index 79bac2abd..ec1339d52 100644 --- a/src/main/java/com/kyanite/deeperdarker/content/blocks/OthersidePortalBlock.java +++ b/src/main/java/com/kyanite/deeperdarker/content/blocks/OthersidePortalBlock.java @@ -123,11 +123,10 @@ public DimensionTransition getPortalDestination(ServerLevel level, Entity pEntit ServerLevel destServerLevel = level.getServer().getLevel(destLevel); if(destServerLevel == null) return null; - boolean isOtherside = destServerLevel.dimension() == OthersideDimension.OTHERSIDE_LEVEL; WorldBorder destBorder = destServerLevel.getWorldBorder(); double scale = DimensionType.getTeleportationScale(level.dimensionType(), destServerLevel.dimensionType()); BlockPos destPos = destBorder.clampToBounds(pEntity.getX() * scale, pEntity.getY(), pEntity.getZ() * scale); - return OthersideTeleporter.getExitPortal(destServerLevel, pEntity, pos, destPos, isOtherside, destBorder); + return OthersideTeleporter.getExitPortal(destServerLevel, pEntity, pos, destPos, destBorder); } public static class PortalSpawnEvent extends BlockEvent implements ICancellableEvent { diff --git a/src/main/java/com/kyanite/deeperdarker/content/items/SonorousStaffItem.java b/src/main/java/com/kyanite/deeperdarker/content/items/SonorousStaffItem.java index 6f8ae9586..53244439e 100644 --- a/src/main/java/com/kyanite/deeperdarker/content/items/SonorousStaffItem.java +++ b/src/main/java/com/kyanite/deeperdarker/content/items/SonorousStaffItem.java @@ -1,5 +1,6 @@ package com.kyanite.deeperdarker.content.items; +import com.kyanite.deeperdarker.content.DDItems; import net.minecraft.core.BlockPos; import net.minecraft.core.component.DataComponents; import net.minecraft.core.particles.ParticleTypes; @@ -86,6 +87,11 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotI } } + @Override + public boolean isValidRepairItem(ItemStack stack, ItemStack repairCandidate) { + return repairCandidate.is(DDItems.SOUL_CRYSTAL); + } + @Override public boolean isFoil(ItemStack stack) { return super.isFoil(stack) || (stack.has(DataComponents.CUSTOM_DATA) && stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getBoolean("charged")); diff --git a/src/main/java/com/kyanite/deeperdarker/content/items/SoulElytraItem.java b/src/main/java/com/kyanite/deeperdarker/content/items/SoulElytraItem.java index da26566c9..9ef53c84c 100644 --- a/src/main/java/com/kyanite/deeperdarker/content/items/SoulElytraItem.java +++ b/src/main/java/com/kyanite/deeperdarker/content/items/SoulElytraItem.java @@ -28,7 +28,7 @@ public static ItemAttributeModifiers createAttributes() { @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return repair.is(DDItems.SOUL_CRYSTAL.get()); + return repair.is(DDItems.SOUL_CRYSTAL); } @Override diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java index 2adb1880e..9c2bbbc0e 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java @@ -135,6 +135,7 @@ protected void addTranslations() { add("tag.item." + DeeperDarker.MOD_ID + ".bloom_stems", "Blooming Stems"); add("tag.item." + DeeperDarker.MOD_ID + ".echo_logs", "Echo Logs"); + add("tag.item." + DeeperDarker.MOD_ID + ".resonarium_armor", "Resonarium Armor"); add("tag.item." + DeeperDarker.MOD_ID + ".dampens_vibrations", "Dampens Vibrations"); add("tag.item." + DeeperDarker.MOD_ID + ".scutes", "Scutes"); @@ -159,8 +160,7 @@ private String convertToName(String key) { StringBuilder builder = new StringBuilder(key.substring(0, 1).toUpperCase() + key.substring(1)); for(int i = 1; i < builder.length(); i++) { if(builder.charAt(i) == '_') { - builder.deleteCharAt(i); - builder.replace(i, i + 1, " " + Character.toUpperCase(builder.charAt(i))); + builder.replace(i, i + 2, " " + Character.toUpperCase(builder.charAt(i + 1))); } } diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/data/DDItemTagsProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/data/DDItemTagsProvider.java index 4227d5819..d3d304073 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/data/DDItemTagsProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/data/DDItemTagsProvider.java @@ -81,7 +81,7 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { tag(ItemTags.CHEST_ARMOR).add(DDItems.RESONARIUM_CHESTPLATE.get(), DDItems.WARDEN_CHESTPLATE.get()); tag(ItemTags.LEG_ARMOR).add(DDItems.RESONARIUM_LEGGINGS.get(), DDItems.WARDEN_LEGGINGS.get()); tag(ItemTags.FOOT_ARMOR).add(DDItems.RESONARIUM_BOOTS.get(), DDItems.WARDEN_BOOTS.get()); - tag(ItemTags.DURABILITY_ENCHANTABLE).add(DDItems.SOUL_ELYTRA.get()); + tag(ItemTags.DURABILITY_ENCHANTABLE).add(DDItems.SOUL_ELYTRA.get(), DDItems.SONOROUS_STAFF.get()); tag(ItemTags.EQUIPPABLE_ENCHANTABLE).add(DDItems.SOUL_ELYTRA.get()); tag(DDTags.Items.RESONARIUM_ARMOR).add(DDItems.RESONARIUM_HELMET.get(), DDItems.RESONARIUM_CHESTPLATE.get(), DDItems.RESONARIUM_LEGGINGS.get(), DDItems.RESONARIUM_BOOTS.get()); diff --git a/src/main/java/com/kyanite/deeperdarker/world/otherside/OthersideDimension.java b/src/main/java/com/kyanite/deeperdarker/world/otherside/OthersideDimension.java index a1434848a..b1f21c74e 100644 --- a/src/main/java/com/kyanite/deeperdarker/world/otherside/OthersideDimension.java +++ b/src/main/java/com/kyanite/deeperdarker/world/otherside/OthersideDimension.java @@ -7,10 +7,10 @@ import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.util.valueproviders.ConstantInt; import net.minecraft.world.entity.ai.village.poi.PoiType; import net.minecraft.world.level.Level; -import net.minecraft.world.level.dimension.BuiltinDimensionTypes; import net.minecraft.world.level.dimension.DimensionType; import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; @@ -20,9 +20,10 @@ public class OthersideDimension { public static final ResourceKey OTHERSIDE_LEVEL = ResourceKey.create(Registries.DIMENSION, DeeperDarker.rl("otherside")); public static final ResourceKey OTHERSIDE = ResourceKey.create(Registries.DIMENSION_TYPE, DeeperDarker.rl("otherside")); + public static final ResourceLocation OTHERSIDE_EFFECTS = DeeperDarker.rl("otherside_effects"); public static void bootstrap(BootstrapContext context) { - context.register(OTHERSIDE, new DimensionType(OptionalLong.of(18000L), false, true, false, true, 1, true, false, 0, 128, 128, DDTags.Blocks.INFINIBURN_OTHERSIDE, BuiltinDimensionTypes.NETHER_EFFECTS, 0.05f, new DimensionType.MonsterSettings(true, false, ConstantInt.of(7), 15))); + context.register(OTHERSIDE, new DimensionType(OptionalLong.of(18000L), false, true, false, true, 1, true, false, 0, 128, 128, DDTags.Blocks.INFINIBURN_OTHERSIDE, OTHERSIDE_EFFECTS, 0.05f, new DimensionType.MonsterSettings(true, false, ConstantInt.of(7), 15))); } public static final DeferredRegister POI = DeferredRegister.create(Registries.POINT_OF_INTEREST_TYPE, DeeperDarker.MOD_ID); diff --git a/src/main/java/com/kyanite/deeperdarker/world/otherside/OthersideTeleporter.java b/src/main/java/com/kyanite/deeperdarker/world/otherside/OthersideTeleporter.java index f966c7bf7..19cb3e5da 100644 --- a/src/main/java/com/kyanite/deeperdarker/world/otherside/OthersideTeleporter.java +++ b/src/main/java/com/kyanite/deeperdarker/world/otherside/OthersideTeleporter.java @@ -7,10 +7,13 @@ import net.minecraft.BlockUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.Vec3i; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityDimensions; +import net.minecraft.world.entity.ai.village.poi.PoiManager; +import net.minecraft.world.entity.ai.village.poi.PoiRecord; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -20,6 +23,7 @@ import net.minecraft.world.level.portal.PortalShape; import net.minecraft.world.phys.Vec3; +import java.util.Comparator; import java.util.Optional; public class OthersideTeleporter { @@ -31,12 +35,13 @@ public class OthersideTeleporter { private static final int PORTAL_WIDTH = DeeperDarkerConfig.othersidePortalWidth; private static final int PORTAL_HEIGHT = DeeperDarkerConfig.othersidePortalHeight; - public static DimensionTransition getExitPortal(ServerLevel destLevel, Entity entity, BlockPos pos, BlockPos exitPos, boolean isOtherside, WorldBorder destBorder) { - Optional closestPos = destLevel.getPortalForcer().findClosestPortalPosition(exitPos, isOtherside, destBorder); + public static DimensionTransition getExitPortal(ServerLevel destLevel, Entity entity, BlockPos pos, BlockPos exitPos, WorldBorder destBorder) { + Optional existingPortalPos = findExistingPortal(destLevel, exitPos, destBorder); BlockUtil.FoundRectangle portal; DimensionTransition.PostDimensionTransition transition; - if(closestPos.isPresent()) { - BlockPos blockPos = closestPos.get(); + + if(existingPortalPos.isPresent()) { + BlockPos blockPos = existingPortalPos.get(); BlockState destState = destLevel.getBlockState(blockPos); portal = BlockUtil.getLargestRectangleAround( blockPos, @@ -49,36 +54,46 @@ public static DimensionTransition getExitPortal(ServerLevel destLevel, Entity en transition = DimensionTransition.PLAY_PORTAL_SOUND.then(entity1 -> entity1.placePortalTicket(blockPos)); } else { Direction.Axis direction = entity.level().getBlockState(pos).getOptionalValue(OthersidePortalBlock.AXIS).orElse(Direction.Axis.X); - Optional rectangle = makePortal(destLevel, exitPos, direction); - if(rectangle.isEmpty()) { - DeeperDarker.LOGGER.error("Unable to create a portal, likely target out of worldborder"); + Optional newPortal = makePortal(destLevel, exitPos, direction); + if(newPortal.isEmpty()) { + DeeperDarker.LOGGER.error("Unable to create a portal, likely target out of world border"); return null; } - portal = rectangle.get(); + portal = newPortal.get(); transition = DimensionTransition.PLAY_PORTAL_SOUND.then(DimensionTransition.PLACE_PORTAL_TICKET); } - return getDimensionTransitionFromExit(entity, pos, portal, destLevel, transition); + return transitionFromExit(entity, pos, portal, destLevel, transition); + } + + private static Optional findExistingPortal(ServerLevel level, BlockPos exitPos, WorldBorder worldBorder) { + PoiManager poimanager = level.getPoiManager(); + poimanager.ensureLoadedAndValid(level, exitPos, 128); + return poimanager.getInSquare(poi -> poi.is(OthersideDimension.OTHERSIDE_PORTAL), exitPos, 128, PoiManager.Occupancy.ANY) + .map(PoiRecord::getPos) + .filter(worldBorder::isWithinBounds) + .filter(pos -> level.getBlockState(pos).hasProperty(BlockStateProperties.HORIZONTAL_AXIS)) + .min(Comparator.comparingDouble(pos -> pos.distSqr(exitPos)).thenComparingInt(Vec3i::getY)); } - private static DimensionTransition getDimensionTransitionFromExit(Entity entity, BlockPos pos, BlockUtil.FoundRectangle rectangle, ServerLevel level, DimensionTransition.PostDimensionTransition postTransition) { + private static DimensionTransition transitionFromExit(Entity entity, BlockPos pos, BlockUtil.FoundRectangle rectangle, ServerLevel level, DimensionTransition.PostDimensionTransition postTransition) { BlockState state = entity.level().getBlockState(pos); Direction.Axis axis; Vec3 vec3; if(state.hasProperty(BlockStateProperties.HORIZONTAL_AXIS)) { axis = state.getValue(BlockStateProperties.HORIZONTAL_AXIS); - BlockUtil.FoundRectangle portal = BlockUtil.getLargestRectangleAround(pos, axis, MAX_WIDTH, Direction.Axis.Y, MAX_HEIGHT, p_351016_ -> entity.level().getBlockState(p_351016_) == state); + BlockUtil.FoundRectangle portal = BlockUtil.getLargestRectangleAround(pos, axis, MAX_WIDTH, Direction.Axis.Y, MAX_HEIGHT, blockPos -> entity.level().getBlockState(blockPos) == state); vec3 = entity.getRelativePortalPosition(axis, portal); } else { axis = Direction.Axis.X; vec3 = new Vec3(0.5, 0.0, 0.0); } - return createDimensionTransition(level, rectangle, axis, vec3, entity, entity.getDeltaMovement(), entity.getYRot(), entity.getXRot(), postTransition); + return createTransition(level, rectangle, axis, vec3, entity, entity.getDeltaMovement(), entity.getYRot(), entity.getXRot(), postTransition); } - private static DimensionTransition createDimensionTransition(ServerLevel level, BlockUtil.FoundRectangle rectangle, Direction.Axis axis, Vec3 offset, Entity entity, Vec3 speed, float yRot, float xRot, DimensionTransition.PostDimensionTransition postTransition) { + private static DimensionTransition createTransition(ServerLevel level, BlockUtil.FoundRectangle rectangle, Direction.Axis axis, Vec3 offset, Entity entity, Vec3 speed, float yRot, float xRot, DimensionTransition.PostDimensionTransition postTransition) { BlockPos cornerPos = rectangle.minCorner; BlockState cornerState = level.getBlockState(cornerPos); Direction.Axis axis1 = cornerState.getOptionalValue(BlockStateProperties.HORIZONTAL_AXIS).orElse(Direction.Axis.X); diff --git a/src/main/resources/data/deeperdarker/tags/entity_type/sculk.json b/src/main/resources/data/deeperdarker/tags/entity_type/sculk.json index 105a51e0a..cfb7d6294 100644 --- a/src/main/resources/data/deeperdarker/tags/entity_type/sculk.json +++ b/src/main/resources/data/deeperdarker/tags/entity_type/sculk.json @@ -6,7 +6,9 @@ "deeperdarker:sculk_snapper", "deeperdarker:shattered", "deeperdarker:shriek_worm", + "deeperdarker:sludge", "deeperdarker:stalker", + "minecraft:phantom", "minecraft:warden" ] } \ No newline at end of file diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_slabs_to_tile.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_slabs_to_tile.json index 828e7c256..76501fd9b 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_slabs_to_tile.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_slabs_to_tile.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_brick_slab" - } + "count": 1, + "item": "deeperdarker:gloomslate_brick_slab" }, "output": { - "item": "deeperdarker:gloomslate_tile_slab" + "count": 1, + "id": "deeperdarker:gloomslate_tile_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_stairs_to_tile.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_stairs_to_tile.json index 820be2886..37caa9888 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_stairs_to_tile.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_stairs_to_tile.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_brick_stairs" - } + "count": 1, + "item": "deeperdarker:gloomslate_brick_stairs" }, "output": { - "item": "deeperdarker:gloomslate_tile_stairs" + "count": 1, + "id": "deeperdarker:gloomslate_tile_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_wall_to_tile.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_wall_to_tile.json index 515223bd7..71a956e99 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_wall_to_tile.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/brick_wall_to_tile.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_brick_wall" - } + "count": 1, + "item": "deeperdarker:gloomslate_brick_wall" }, "output": { - "item": "deeperdarker:gloomslate_tile_wall" + "count": 1, + "id": "deeperdarker:gloomslate_tile_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/bricks_to_tiles.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/bricks_to_tiles.json index 3d0c69963..96b0a7292 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/bricks_to_tiles.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/bricks_to_tiles.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_bricks" - } + "count": 1, + "item": "deeperdarker:gloomslate_bricks" }, "output": { - "item": "deeperdarker:gloomslate_tiles" + "count": 1, + "id": "deeperdarker:gloomslate_tiles" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_slabs_to_polished.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_slabs_to_polished.json index 75361230e..8303d78f1 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_slabs_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_slabs_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:cut_gloomslate_slab" - } + "count": 1, + "item": "deeperdarker:cut_gloomslate_slab" }, "output": { - "item": "deeperdarker:polished_gloomslate_slab" + "count": 1, + "id": "deeperdarker:polished_gloomslate_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_stairs_to_polished.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_stairs_to_polished.json index 17c267530..ba38550d4 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_stairs_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_stairs_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:cut_gloomslate_stairs" - } + "count": 1, + "item": "deeperdarker:cut_gloomslate_stairs" }, "output": { - "item": "deeperdarker:polished_gloomslate_stairs" + "count": 1, + "id": "deeperdarker:polished_gloomslate_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_to_polished.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_to_polished.json index 6a4980edc..185009d34 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:cut_gloomslate" - } + "count": 1, + "item": "deeperdarker:cut_gloomslate" }, "output": { - "item": "deeperdarker:polished_gloomslate" + "count": 1, + "id": "deeperdarker:polished_gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_wall_to_polished.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_wall_to_polished.json index 886146ef8..1d93f38ad 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_wall_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/cut_wall_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:cut_gloomslate_wall" - } + "count": 1, + "item": "deeperdarker:cut_gloomslate_wall" }, "output": { - "item": "deeperdarker:polished_gloomslate_wall" + "count": 1, + "id": "deeperdarker:polished_gloomslate_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/from_chiseled.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/from_chiseled.json index c7870ab35..dd7ce693b 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/from_chiseled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/from_chiseled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:chiseled_gloomslate" - } + "count": 1, + "item": "deeperdarker:chiseled_gloomslate" }, "output": { - "item": "deeperdarker:gloomslate" + "count": 1, + "id": "deeperdarker:gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_slabs_to_brick.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_slabs_to_brick.json index c13518521..ffa0a6ccd 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_slabs_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_slabs_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:polished_gloomslate_slab" - } + "count": 1, + "item": "deeperdarker:polished_gloomslate_slab" }, "output": { - "item": "deeperdarker:gloomslate_brick_slab" + "count": 1, + "id": "deeperdarker:gloomslate_brick_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_stairs_to_brick.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_stairs_to_brick.json index 39d8de3e9..2b6377c6c 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_stairs_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_stairs_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:polished_gloomslate_stairs" - } + "count": 1, + "item": "deeperdarker:polished_gloomslate_stairs" }, "output": { - "item": "deeperdarker:gloomslate_brick_stairs" + "count": 1, + "id": "deeperdarker:gloomslate_brick_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_to_bricks.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_to_bricks.json index 79fa979c2..203622a0c 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_to_bricks.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_to_bricks.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:polished_gloomslate" - } + "count": 1, + "item": "deeperdarker:polished_gloomslate" }, "output": { - "item": "deeperdarker:gloomslate_bricks" + "count": 1, + "id": "deeperdarker:gloomslate_bricks" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_wall_to_brick.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_wall_to_brick.json index ecdd79ad2..595f6ab7b 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_wall_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/polished_wall_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:polished_gloomslate_wall" - } + "count": 1, + "item": "deeperdarker:polished_gloomslate_wall" }, "output": { - "item": "deeperdarker:gloomslate_brick_wall" + "count": 1, + "id": "deeperdarker:gloomslate_brick_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/slabs_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/slabs_to_cobbled.json index a00dc8581..ac6db0376 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/slabs_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/slabs_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_slab" - } + "count": 1, + "item": "deeperdarker:gloomslate_slab" }, "output": { - "item": "deeperdarker:cobbled_gloomslate_slab" + "count": 1, + "id": "deeperdarker:cobbled_gloomslate_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_slabs_to_cut.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_slabs_to_cut.json index cace64e11..5ca4835f5 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_slabs_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_slabs_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:smooth_gloomslate_slab" - } + "count": 1, + "item": "deeperdarker:smooth_gloomslate_slab" }, "output": { - "item": "deeperdarker:cut_gloomslate_slab" + "count": 1, + "id": "deeperdarker:cut_gloomslate_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_stairs_to_cut.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_stairs_to_cut.json index 23bf48ea0..6502f2e9b 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_stairs_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_stairs_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:smooth_gloomslate_stairs" - } + "count": 1, + "item": "deeperdarker:smooth_gloomslate_stairs" }, "output": { - "item": "deeperdarker:cut_gloomslate_stairs" + "count": 1, + "id": "deeperdarker:cut_gloomslate_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_to_cut.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_to_cut.json index 906603cf8..17f8c6c38 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:smooth_gloomslate" - } + "count": 1, + "item": "deeperdarker:smooth_gloomslate" }, "output": { - "item": "deeperdarker:cut_gloomslate" + "count": 1, + "id": "deeperdarker:cut_gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_wall_to_cut.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_wall_to_cut.json index f7cc56282..d9e5616d7 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_wall_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/smooth_wall_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:smooth_gloomslate_wall" - } + "count": 1, + "item": "deeperdarker:smooth_gloomslate_wall" }, "output": { - "item": "deeperdarker:cut_gloomslate_wall" + "count": 1, + "id": "deeperdarker:cut_gloomslate_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/stairs_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/stairs_to_cobbled.json index 43dcfa775..2c67358df 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/stairs_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/stairs_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_stairs" - } + "count": 1, + "item": "deeperdarker:gloomslate_stairs" }, "output": { - "item": "deeperdarker:cobbled_gloomslate_stairs" + "count": 1, + "id": "deeperdarker:cobbled_gloomslate_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_slabs_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_slabs_to_cobbled.json index c79b4eeb6..7cc3c1dcb 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_slabs_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_slabs_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_tile_slab" - } + "count": 1, + "item": "deeperdarker:gloomslate_tile_slab" }, "output": { - "item": "deeperdarker:cobbled_gloomslate_slab" + "count": 1, + "id": "deeperdarker:cobbled_gloomslate_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_stairs_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_stairs_to_cobbled.json index 28c0c183a..43f19c866 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_stairs_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_stairs_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_tile_stairs" - } + "count": 1, + "item": "deeperdarker:gloomslate_tile_stairs" }, "output": { - "item": "deeperdarker:cobbled_gloomslate_stairs" + "count": 1, + "id": "deeperdarker:cobbled_gloomslate_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_to_cobbled.json index b2c95f631..aceb32280 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_tiles" - } + "count": 1, + "item": "deeperdarker:gloomslate_tiles" }, "output": { - "item": "deeperdarker:cobbled_gloomslate" + "count": 1, + "id": "deeperdarker:cobbled_gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_wall_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_wall_to_cobbled.json index 3617a05c1..d83ea9f8e 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_wall_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/tile_wall_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_tile_wall" - } + "count": 1, + "item": "deeperdarker:gloomslate_tile_wall" }, "output": { - "item": "deeperdarker:cobbled_gloomslate_wall" + "count": 1, + "id": "deeperdarker:cobbled_gloomslate_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/to_cobbled.json index 470ea1ce7..e42eed3ea 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate" - } + "count": 1, + "item": "deeperdarker:gloomslate" }, "output": { - "item": "deeperdarker:cobbled_gloomslate" + "count": 1, + "id": "deeperdarker:cobbled_gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/wall_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/wall_to_cobbled.json index 1cce17339..1ebd11e66 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/gloomslate/wall_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/gloomslate/wall_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_wall" - } + "count": 1, + "item": "deeperdarker:gloomslate_wall" }, "output": { - "item": "deeperdarker:cobbled_gloomslate_wall" + "count": 1, + "id": "deeperdarker:cobbled_gloomslate_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_slabs_to_tile.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_slabs_to_tile.json index 4cebbad2e..e82d588e3 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_slabs_to_tile.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_slabs_to_tile.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_brick_slab" - } + "count": 1, + "item": "deeperdarker:sculk_stone_brick_slab" }, "output": { - "item": "deeperdarker:sculk_stone_tile_slab" + "count": 1, + "id": "deeperdarker:sculk_stone_tile_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_stairs_to_tile.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_stairs_to_tile.json index 290a5296d..ed0be7f26 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_stairs_to_tile.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_stairs_to_tile.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_brick_stairs" - } + "count": 1, + "item": "deeperdarker:sculk_stone_brick_stairs" }, "output": { - "item": "deeperdarker:sculk_stone_tile_stairs" + "count": 1, + "id": "deeperdarker:sculk_stone_tile_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_wall_to_tile.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_wall_to_tile.json index 3df0aba68..463f27739 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_wall_to_tile.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/brick_wall_to_tile.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_brick_wall" - } + "count": 1, + "item": "deeperdarker:sculk_stone_brick_wall" }, "output": { - "item": "deeperdarker:sculk_stone_tile_wall" + "count": 1, + "id": "deeperdarker:sculk_stone_tile_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/bricks_to_tiles.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/bricks_to_tiles.json index c3b0f581d..e5d6c7dc1 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/bricks_to_tiles.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/bricks_to_tiles.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_bricks" - } + "count": 1, + "item": "deeperdarker:sculk_stone_bricks" }, "output": { - "item": "deeperdarker:sculk_stone_tiles" + "count": 1, + "id": "deeperdarker:sculk_stone_tiles" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_slabs_to_polished.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_slabs_to_polished.json index 41acc1e3c..1051f4050 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_slabs_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_slabs_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:cut_sculk_stone_slab" - } + "count": 1, + "item": "deeperdarker:cut_sculk_stone_slab" }, "output": { - "item": "deeperdarker:polished_sculk_stone_slab" + "count": 1, + "id": "deeperdarker:polished_sculk_stone_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_stairs_to_polished.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_stairs_to_polished.json index 729958224..acaa24d7a 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_stairs_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_stairs_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:cut_sculk_stone_stairs" - } + "count": 1, + "item": "deeperdarker:cut_sculk_stone_stairs" }, "output": { - "item": "deeperdarker:polished_sculk_stone_stairs" + "count": 1, + "id": "deeperdarker:polished_sculk_stone_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_to_polished.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_to_polished.json index 9faa3f72a..5e67f48f6 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:cut_sculk_stone" - } + "count": 1, + "item": "deeperdarker:cut_sculk_stone" }, "output": { - "item": "deeperdarker:polished_sculk_stone" + "count": 1, + "id": "deeperdarker:polished_sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_wall_to_polished.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_wall_to_polished.json index c08e7c80e..d0381febd 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_wall_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/cut_wall_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:cut_sculk_stone_wall" - } + "count": 1, + "item": "deeperdarker:cut_sculk_stone_wall" }, "output": { - "item": "deeperdarker:polished_sculk_stone_wall" + "count": 1, + "id": "deeperdarker:polished_sculk_stone_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/from_chiseled.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/from_chiseled.json index b95ec2a80..2ce7d9ee8 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/from_chiseled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/from_chiseled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:chiseled_sculk_stone" - } + "count": 1, + "item": "deeperdarker:chiseled_sculk_stone" }, "output": { - "item": "deeperdarker:sculk_stone" + "count": 1, + "id": "deeperdarker:sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_slabs_to_brick.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_slabs_to_brick.json index ff21852ef..c5007f979 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_slabs_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_slabs_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:polished_sculk_stone_slab" - } + "count": 1, + "item": "deeperdarker:polished_sculk_stone_slab" }, "output": { - "item": "deeperdarker:sculk_stone_brick_slab" + "count": 1, + "id": "deeperdarker:sculk_stone_brick_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_stairs_to_brick.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_stairs_to_brick.json index e534a929f..b128fbd14 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_stairs_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_stairs_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:polished_sculk_stone_stairs" - } + "count": 1, + "item": "deeperdarker:polished_sculk_stone_stairs" }, "output": { - "item": "deeperdarker:sculk_stone_brick_stairs" + "count": 1, + "id": "deeperdarker:sculk_stone_brick_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_to_bricks.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_to_bricks.json index 1c04b5c84..0a445ab59 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_to_bricks.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_to_bricks.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:polished_sculk_stone" - } + "count": 1, + "item": "deeperdarker:polished_sculk_stone" }, "output": { - "item": "deeperdarker:sculk_stone_bricks" + "count": 1, + "id": "deeperdarker:sculk_stone_bricks" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_wall_to_brick.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_wall_to_brick.json index 5a54023f3..9bf83388e 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_wall_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/polished_wall_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:polished_sculk_stone_wall" - } + "count": 1, + "item": "deeperdarker:polished_sculk_stone_wall" }, "output": { - "item": "deeperdarker:sculk_stone_brick_wall" + "count": 1, + "id": "deeperdarker:sculk_stone_brick_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/slabs_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/slabs_to_cobbled.json index 3b686cf47..ea7f58620 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/slabs_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/slabs_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_slab" - } + "count": 1, + "item": "deeperdarker:sculk_stone_slab" }, "output": { - "item": "deeperdarker:cobbled_sculk_stone_slab" + "count": 1, + "id": "deeperdarker:cobbled_sculk_stone_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_slabs_to_cut.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_slabs_to_cut.json index d63110813..ab376f64a 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_slabs_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_slabs_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:smooth_sculk_stone_slab" - } + "count": 1, + "item": "deeperdarker:smooth_sculk_stone_slab" }, "output": { - "item": "deeperdarker:cut_sculk_stone_slab" + "count": 1, + "id": "deeperdarker:cut_sculk_stone_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_stairs_to_cut.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_stairs_to_cut.json index 531cff7c3..258bb1dcb 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_stairs_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_stairs_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:smooth_sculk_stone_stairs" - } + "count": 1, + "item": "deeperdarker:smooth_sculk_stone_stairs" }, "output": { - "item": "deeperdarker:cut_sculk_stone_stairs" + "count": 1, + "id": "deeperdarker:cut_sculk_stone_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_to_cut.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_to_cut.json index a7c37a775..c0624d48f 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:smooth_sculk_stone" - } + "count": 1, + "item": "deeperdarker:smooth_sculk_stone" }, "output": { - "item": "deeperdarker:cut_sculk_stone" + "count": 1, + "id": "deeperdarker:cut_sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_wall_to_cut.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_wall_to_cut.json index 4923ffa18..9036c7883 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_wall_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/smooth_wall_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:smooth_sculk_stone_wall" - } + "count": 1, + "item": "deeperdarker:smooth_sculk_stone_wall" }, "output": { - "item": "deeperdarker:cut_sculk_stone_wall" + "count": 1, + "id": "deeperdarker:cut_sculk_stone_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/stairs_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/stairs_to_cobbled.json index 8ffaf13ee..510e8b928 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/stairs_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/stairs_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_stairs" - } + "count": 1, + "item": "deeperdarker:sculk_stone_stairs" }, "output": { - "item": "deeperdarker:cobbled_sculk_stone_stairs" + "count": 1, + "id": "deeperdarker:cobbled_sculk_stone_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_slabs_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_slabs_to_cobbled.json index 1438f73a8..e4eccb8f5 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_slabs_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_slabs_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_tile_slab" - } + "count": 1, + "item": "deeperdarker:sculk_stone_tile_slab" }, "output": { - "item": "deeperdarker:cobbled_sculk_stone_slab" + "count": 1, + "id": "deeperdarker:cobbled_sculk_stone_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_stairs_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_stairs_to_cobbled.json index d8b4e6758..8ebfff8f2 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_stairs_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_stairs_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_tile_stairs" - } + "count": 1, + "item": "deeperdarker:sculk_stone_tile_stairs" }, "output": { - "item": "deeperdarker:cobbled_sculk_stone_stairs" + "count": 1, + "id": "deeperdarker:cobbled_sculk_stone_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_to_cobbled.json index c955ecda8..5156a166f 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_tiles" - } + "count": 1, + "item": "deeperdarker:sculk_stone_tiles" }, "output": { - "item": "deeperdarker:cobbled_sculk_stone" + "count": 1, + "id": "deeperdarker:cobbled_sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_wall_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_wall_to_cobbled.json index 2efa60f28..dcd313640 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_wall_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/tile_wall_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_tile_wall" - } + "count": 1, + "item": "deeperdarker:sculk_stone_tile_wall" }, "output": { - "item": "deeperdarker:cobbled_sculk_stone_wall" + "count": 1, + "id": "deeperdarker:cobbled_sculk_stone_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/to_cobbled.json index 681ea79c3..a258e0637 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone" - } + "count": 1, + "item": "deeperdarker:sculk_stone" }, "output": { - "item": "deeperdarker:cobbled_sculk_stone" + "count": 1, + "id": "deeperdarker:cobbled_sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/wall_to_cobbled.json b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/wall_to_cobbled.json index eac3ca21f..eeb3cca23 100644 --- a/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/wall_to_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/crushing/sculk_stone/wall_to_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:crushing", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_wall" - } + "count": 1, + "item": "deeperdarker:sculk_stone_wall" }, "output": { - "item": "deeperdarker:cobbled_sculk_stone_wall" + "count": 1, + "id": "deeperdarker:cobbled_sculk_stone_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_slabs_to_polished.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_slabs_to_polished.json index eccd41495..e9a97a9ea 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_slabs_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_slabs_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_brick_slab" - } + "count": 1, + "item": "deeperdarker:gloomslate_brick_slab" }, "output": { - "item": "deeperdarker:polished_gloomslate_slab" + "count": 1, + "id": "deeperdarker:polished_gloomslate_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_stairs_to_polished.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_stairs_to_polished.json index 806e63966..d5afe9a67 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_stairs_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_stairs_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_brick_stairs" - } + "count": 1, + "item": "deeperdarker:gloomslate_brick_stairs" }, "output": { - "item": "deeperdarker:polished_gloomslate_stairs" + "count": 1, + "id": "deeperdarker:polished_gloomslate_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_wall_to_polished.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_wall_to_polished.json index d9a43d02b..eb0663997 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_wall_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/brick_wall_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_brick_wall" - } + "count": 1, + "item": "deeperdarker:gloomslate_brick_wall" }, "output": { - "item": "deeperdarker:polished_gloomslate_wall" + "count": 1, + "id": "deeperdarker:polished_gloomslate_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/bricks_to_polished.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/bricks_to_polished.json index e99500d4c..36e447e17 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/bricks_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/bricks_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_bricks" - } + "count": 1, + "item": "deeperdarker:gloomslate_bricks" }, "output": { - "item": "deeperdarker:polished_gloomslate" + "count": 1, + "id": "deeperdarker:polished_gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_slabs_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_slabs_to_smooth.json index 7cf9aa85b..919bba3ac 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_slabs_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_slabs_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cut_gloomslate_slab" - } + "count": 1, + "item": "deeperdarker:cut_gloomslate_slab" }, "output": { - "item": "deeperdarker:smooth_gloomslate_slab" + "count": 1, + "id": "deeperdarker:smooth_gloomslate_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_stairs_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_stairs_to_smooth.json index f70865934..18fe7b166 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_stairs_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_stairs_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cut_gloomslate_stairs" - } + "count": 1, + "item": "deeperdarker:cut_gloomslate_stairs" }, "output": { - "item": "deeperdarker:smooth_gloomslate_stairs" + "count": 1, + "id": "deeperdarker:smooth_gloomslate_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_to_smooth.json index 070a983c1..2abf6463f 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cut_gloomslate" - } + "count": 1, + "item": "deeperdarker:cut_gloomslate" }, "output": { - "item": "deeperdarker:smooth_gloomslate" + "count": 1, + "id": "deeperdarker:smooth_gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_wall_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_wall_to_smooth.json index f52eba3a5..662177771 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_wall_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/cut_wall_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cut_gloomslate_wall" - } + "count": 1, + "item": "deeperdarker:cut_gloomslate_wall" }, "output": { - "item": "deeperdarker:smooth_gloomslate_wall" + "count": 1, + "id": "deeperdarker:smooth_gloomslate_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled.json index 2cbecce14..2e47b8c9f 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cobbled_gloomslate" - } + "count": 1, + "item": "deeperdarker:cobbled_gloomslate" }, "output": { - "item": "deeperdarker:gloomslate" + "count": 1, + "id": "deeperdarker:gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_slabs.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_slabs.json index 5afe4c583..0a5a87078 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_slabs.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_slabs.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cobbled_gloomslate_slab" - } + "count": 1, + "item": "deeperdarker:cobbled_gloomslate_slab" }, "output": { - "item": "deeperdarker:gloomslate_slab" + "count": 1, + "id": "deeperdarker:gloomslate_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_stairs.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_stairs.json index 59e0387e3..46bb4ebf0 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_stairs.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_stairs.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cobbled_gloomslate_stairs" - } + "count": 1, + "item": "deeperdarker:cobbled_gloomslate_stairs" }, "output": { - "item": "deeperdarker:gloomslate_stairs" + "count": 1, + "id": "deeperdarker:gloomslate_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_wall.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_wall.json index 408fa64e9..d9538f4ac 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_wall.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/from_cobbled_wall.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cobbled_gloomslate_wall" - } + "count": 1, + "item": "deeperdarker:cobbled_gloomslate_wall" }, "output": { - "item": "deeperdarker:gloomslate_wall" + "count": 1, + "id": "deeperdarker:gloomslate_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_slabs_to_cut.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_slabs_to_cut.json index c757efefc..1be3b7652 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_slabs_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_slabs_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:polished_gloomslate_slab" - } + "count": 1, + "item": "deeperdarker:polished_gloomslate_slab" }, "output": { - "item": "deeperdarker:cut_gloomslate_slab" + "count": 1, + "id": "deeperdarker:cut_gloomslate_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_stairs_to_cut.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_stairs_to_cut.json index 774f3a31d..b142c3816 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_stairs_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_stairs_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:polished_gloomslate_stairs" - } + "count": 1, + "item": "deeperdarker:polished_gloomslate_stairs" }, "output": { - "item": "deeperdarker:cut_gloomslate_stairs" + "count": 1, + "id": "deeperdarker:cut_gloomslate_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_to_cut.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_to_cut.json index 97f139fa5..d841abab2 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:polished_gloomslate" - } + "count": 1, + "item": "deeperdarker:polished_gloomslate" }, "output": { - "item": "deeperdarker:cut_gloomslate" + "count": 1, + "id": "deeperdarker:cut_gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_wall_to_cut.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_wall_to_cut.json index d05375efa..5fd294709 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_wall_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/polished_wall_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:polished_gloomslate_wall" - } + "count": 1, + "item": "deeperdarker:polished_gloomslate_wall" }, "output": { - "item": "deeperdarker:cut_gloomslate_wall" + "count": 1, + "id": "deeperdarker:cut_gloomslate_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/slabs_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/slabs_to_smooth.json index e73727499..c139f2445 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/slabs_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/slabs_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_slab" - } + "count": 1, + "item": "deeperdarker:gloomslate_slab" }, "output": { - "item": "deeperdarker:smooth_gloomslate_slab" + "count": 1, + "id": "deeperdarker:smooth_gloomslate_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/stairs_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/stairs_to_smooth.json index f94d8a2dc..c87e20e9a 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/stairs_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/stairs_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_stairs" - } + "count": 1, + "item": "deeperdarker:gloomslate_stairs" }, "output": { - "item": "deeperdarker:smooth_gloomslate_stairs" + "count": 1, + "id": "deeperdarker:smooth_gloomslate_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_slabs_to_brick.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_slabs_to_brick.json index bca5d6f2d..bb3eb1cc4 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_slabs_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_slabs_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_tile_slab" - } + "count": 1, + "item": "deeperdarker:gloomslate_tile_slab" }, "output": { - "item": "deeperdarker:gloomslate_brick_slab" + "count": 1, + "id": "deeperdarker:gloomslate_brick_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_stairs_to_brick.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_stairs_to_brick.json index 654b1d961..c39029aea 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_stairs_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_stairs_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_tile_stairs" - } + "count": 1, + "item": "deeperdarker:gloomslate_tile_stairs" }, "output": { - "item": "deeperdarker:gloomslate_brick_stairs" + "count": 1, + "id": "deeperdarker:gloomslate_brick_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_wall_to_brick.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_wall_to_brick.json index caef379d3..4e6fdd1d6 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_wall_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tile_wall_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_tile_wall" - } + "count": 1, + "item": "deeperdarker:gloomslate_tile_wall" }, "output": { - "item": "deeperdarker:gloomslate_brick_wall" + "count": 1, + "id": "deeperdarker:gloomslate_brick_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tiles_to_bricks.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tiles_to_bricks.json index 841eada51..63814e6ed 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tiles_to_bricks.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/tiles_to_bricks.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_tiles" - } + "count": 1, + "item": "deeperdarker:gloomslate_tiles" }, "output": { - "item": "deeperdarker:gloomslate_bricks" + "count": 1, + "id": "deeperdarker:gloomslate_bricks" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/to_smooth.json index ae979e46d..ebdfca60c 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate" - } + "count": 1, + "item": "deeperdarker:gloomslate" }, "output": { - "item": "deeperdarker:smooth_gloomslate" + "count": 1, + "id": "deeperdarker:smooth_gloomslate" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/wall_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/wall_to_smooth.json index 92042e3ea..b5c182f8f 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/wall_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/gloomslate/wall_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:gloomslate_wall" - } + "count": 1, + "item": "deeperdarker:gloomslate_wall" }, "output": { - "item": "deeperdarker:smooth_gloomslate_wall" + "count": 1, + "id": "deeperdarker:smooth_gloomslate_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_slabs_to_polished.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_slabs_to_polished.json index 0b41e0d37..9a57f3142 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_slabs_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_slabs_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_brick_slab" - } + "count": 1, + "item": "deeperdarker:sculk_stone_brick_slab" }, "output": { - "item": "deeperdarker:polished_sculk_stone_slab" + "count": 1, + "id": "deeperdarker:polished_sculk_stone_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_stairs_to_polished.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_stairs_to_polished.json index 376021488..9153bbdeb 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_stairs_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_stairs_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_brick_stairs" - } + "count": 1, + "item": "deeperdarker:sculk_stone_brick_stairs" }, "output": { - "item": "deeperdarker:polished_sculk_stone_stairs" + "count": 1, + "id": "deeperdarker:polished_sculk_stone_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_wall_to_polished.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_wall_to_polished.json index bb1c5074e..ef1c76b92 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_wall_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/brick_wall_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_brick_wall" - } + "count": 1, + "item": "deeperdarker:sculk_stone_brick_wall" }, "output": { - "item": "deeperdarker:polished_sculk_stone_wall" + "count": 1, + "id": "deeperdarker:polished_sculk_stone_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/bricks_to_polished.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/bricks_to_polished.json index 8408ee413..412b25b4e 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/bricks_to_polished.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/bricks_to_polished.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_bricks" - } + "count": 1, + "item": "deeperdarker:sculk_stone_bricks" }, "output": { - "item": "deeperdarker:polished_sculk_stone" + "count": 1, + "id": "deeperdarker:polished_sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_slabs_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_slabs_to_smooth.json index 300dba862..9c38c0644 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_slabs_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_slabs_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cut_sculk_stone_slab" - } + "count": 1, + "item": "deeperdarker:cut_sculk_stone_slab" }, "output": { - "item": "deeperdarker:smooth_sculk_stone_slab" + "count": 1, + "id": "deeperdarker:smooth_sculk_stone_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_stairs_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_stairs_to_smooth.json index 09580927b..0893cdb8d 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_stairs_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_stairs_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cut_sculk_stone_stairs" - } + "count": 1, + "item": "deeperdarker:cut_sculk_stone_stairs" }, "output": { - "item": "deeperdarker:smooth_sculk_stone_stairs" + "count": 1, + "id": "deeperdarker:smooth_sculk_stone_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_to_smooth.json index 0ecfc125f..91f913b3c 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cut_sculk_stone" - } + "count": 1, + "item": "deeperdarker:cut_sculk_stone" }, "output": { - "item": "deeperdarker:smooth_sculk_stone" + "count": 1, + "id": "deeperdarker:smooth_sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_wall_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_wall_to_smooth.json index 6200830f9..27c586828 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_wall_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/cut_wall_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cut_sculk_stone_wall" - } + "count": 1, + "item": "deeperdarker:cut_sculk_stone_wall" }, "output": { - "item": "deeperdarker:smooth_sculk_stone_wall" + "count": 1, + "id": "deeperdarker:smooth_sculk_stone_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled.json index 5aeb0753e..10c6f8bf6 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cobbled_sculk_stone" - } + "count": 1, + "item": "deeperdarker:cobbled_sculk_stone" }, "output": { - "item": "deeperdarker:sculk_stone" + "count": 1, + "id": "deeperdarker:sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_slabs.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_slabs.json index 207f6b358..706c527a1 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_slabs.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_slabs.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cobbled_sculk_stone_slab" - } + "count": 1, + "item": "deeperdarker:cobbled_sculk_stone_slab" }, "output": { - "item": "deeperdarker:sculk_stone_slab" + "count": 1, + "id": "deeperdarker:sculk_stone_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_stairs.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_stairs.json index 483d63ca9..26cd7360f 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_stairs.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_stairs.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cobbled_sculk_stone_stairs" - } + "count": 1, + "item": "deeperdarker:cobbled_sculk_stone_stairs" }, "output": { - "item": "deeperdarker:sculk_stone_stairs" + "count": 1, + "id": "deeperdarker:sculk_stone_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_wall.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_wall.json index 9b2a473dc..94ee6bd66 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_wall.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/from_cobbled_wall.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:cobbled_sculk_stone_wall" - } + "count": 1, + "item": "deeperdarker:cobbled_sculk_stone_wall" }, "output": { - "item": "deeperdarker:sculk_stone_wall" + "count": 1, + "id": "deeperdarker:sculk_stone_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_slabs_to_cut.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_slabs_to_cut.json index 8799c3974..dcb8732b1 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_slabs_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_slabs_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:polished_sculk_stone_slab" - } + "count": 1, + "item": "deeperdarker:polished_sculk_stone_slab" }, "output": { - "item": "deeperdarker:cut_sculk_stone_slab" + "count": 1, + "id": "deeperdarker:cut_sculk_stone_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_stairs_to_cut.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_stairs_to_cut.json index 94cace2dd..f83b7f969 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_stairs_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_stairs_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:polished_sculk_stone_stairs" - } + "count": 1, + "item": "deeperdarker:polished_sculk_stone_stairs" }, "output": { - "item": "deeperdarker:cut_sculk_stone_stairs" + "count": 1, + "id": "deeperdarker:cut_sculk_stone_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_to_cut.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_to_cut.json index cd36d57b3..bd9678a77 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:polished_sculk_stone" - } + "count": 1, + "item": "deeperdarker:polished_sculk_stone" }, "output": { - "item": "deeperdarker:cut_sculk_stone" + "count": 1, + "id": "deeperdarker:cut_sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_wall_to_cut.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_wall_to_cut.json index dd5fb65f8..c3f58c3c2 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_wall_to_cut.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/polished_wall_to_cut.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:polished_sculk_stone_wall" - } + "count": 1, + "item": "deeperdarker:polished_sculk_stone_wall" }, "output": { - "item": "deeperdarker:cut_sculk_stone_wall" + "count": 1, + "id": "deeperdarker:cut_sculk_stone_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/slabs_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/slabs_to_smooth.json index 52e61ef8d..f1492df32 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/slabs_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/slabs_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_slab" - } + "count": 1, + "item": "deeperdarker:sculk_stone_slab" }, "output": { - "item": "deeperdarker:smooth_sculk_stone_slab" + "count": 1, + "id": "deeperdarker:smooth_sculk_stone_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/stairs_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/stairs_to_smooth.json index dd9c217b2..8601ebde8 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/stairs_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/stairs_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_stairs" - } + "count": 1, + "item": "deeperdarker:sculk_stone_stairs" }, "output": { - "item": "deeperdarker:smooth_sculk_stone_stairs" + "count": 1, + "id": "deeperdarker:smooth_sculk_stone_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_slabs_to_brick.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_slabs_to_brick.json index 71b31b659..2a6144f46 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_slabs_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_slabs_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_tile_slab" - } + "count": 1, + "item": "deeperdarker:sculk_stone_tile_slab" }, "output": { - "item": "deeperdarker:sculk_stone_brick_slab" + "count": 1, + "id": "deeperdarker:sculk_stone_brick_slab" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_stairs_to_brick.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_stairs_to_brick.json index 3b83fa46e..dded6d96a 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_stairs_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_stairs_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_tile_stairs" - } + "count": 1, + "item": "deeperdarker:sculk_stone_tile_stairs" }, "output": { - "item": "deeperdarker:sculk_stone_brick_stairs" + "count": 1, + "id": "deeperdarker:sculk_stone_brick_stairs" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_wall_to_brick.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_wall_to_brick.json index 7c68558e9..d8d66dbd3 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_wall_to_brick.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tile_wall_to_brick.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_tile_wall" - } + "count": 1, + "item": "deeperdarker:sculk_stone_tile_wall" }, "output": { - "item": "deeperdarker:sculk_stone_brick_wall" + "count": 1, + "id": "deeperdarker:sculk_stone_brick_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tiles_to_bricks.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tiles_to_bricks.json index 8795467a8..7ecec547e 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tiles_to_bricks.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/tiles_to_bricks.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_tiles" - } + "count": 1, + "item": "deeperdarker:sculk_stone_tiles" }, "output": { - "item": "deeperdarker:sculk_stone_bricks" + "count": 1, + "id": "deeperdarker:sculk_stone_bricks" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/to_smooth.json index d50c8d7eb..9bf3f5789 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone" - } + "count": 1, + "item": "deeperdarker:sculk_stone" }, "output": { - "item": "deeperdarker:smooth_sculk_stone" + "count": 1, + "id": "deeperdarker:smooth_sculk_stone" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/wall_to_smooth.json b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/wall_to_smooth.json index 19139448f..f5dbc0286 100644 --- a/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/wall_to_smooth.json +++ b/src/main/resources/data/mekanism/recipe/enriching/conversion/sculk_stone/wall_to_smooth.json @@ -1,12 +1,12 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "deeperdarker:sculk_stone_wall" - } + "count": 1, + "item": "deeperdarker:sculk_stone_wall" }, "output": { - "item": "deeperdarker:smooth_sculk_stone_wall" + "count": 1, + "id": "deeperdarker:smooth_sculk_stone_wall" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/sawing/boat/echo.json b/src/main/resources/data/mekanism/recipe/sawing/boat/echo.json index 0357c2d34..42e176e6a 100644 --- a/src/main/resources/data/mekanism/recipe/sawing/boat/echo.json +++ b/src/main/resources/data/mekanism/recipe/sawing/boat/echo.json @@ -1,13 +1,12 @@ { "type": "mekanism:sawing", "input": { - "ingredient": { - "item": "deeperdarker:echo_boat" - } + "count": 1, + "item": "deeperdarker:echo_boat" }, "mainOutput": { "count": 5, - "item": "deeperdarker:echo_planks" + "id": "deeperdarker:echo_planks" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/sawing/chest_boat/echo.json b/src/main/resources/data/mekanism/recipe/sawing/chest_boat/echo.json index fc24471e0..9a3d08a20 100644 --- a/src/main/resources/data/mekanism/recipe/sawing/chest_boat/echo.json +++ b/src/main/resources/data/mekanism/recipe/sawing/chest_boat/echo.json @@ -1,16 +1,17 @@ { "type": "mekanism:sawing", "input": { - "ingredient": { - "item": "deeperdarker:echo_chest_boat" - } + "count": 1, + "item": "deeperdarker:echo_chest_boat" }, "mainOutput": { - "item": "deeperdarker:echo_boat" + "count": 1, + "id": "deeperdarker:echo_boat" }, "secondaryChance": 1.0, "secondaryOutput": { - "item": "minecraft:chest" + "count": 1, + "id": "minecraft:chest" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/sawing/door/echo.json b/src/main/resources/data/mekanism/recipe/sawing/door/echo.json index 7c674db29..76a4dff19 100644 --- a/src/main/resources/data/mekanism/recipe/sawing/door/echo.json +++ b/src/main/resources/data/mekanism/recipe/sawing/door/echo.json @@ -1,13 +1,12 @@ { "type": "mekanism:sawing", "input": { - "ingredient": { - "item": "deeperdarker:echo_door" - } + "count": 1, + "item": "deeperdarker:echo_door" }, "mainOutput": { "count": 2, - "item": "deeperdarker:echo_planks" + "id": "deeperdarker:echo_planks" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/sawing/fence_gate/echo.json b/src/main/resources/data/mekanism/recipe/sawing/fence_gate/echo.json index 9fad5f636..c35e2c793 100644 --- a/src/main/resources/data/mekanism/recipe/sawing/fence_gate/echo.json +++ b/src/main/resources/data/mekanism/recipe/sawing/fence_gate/echo.json @@ -1,18 +1,17 @@ { "type": "mekanism:sawing", "input": { - "ingredient": { - "item": "deeperdarker:echo_fence_gate" - } + "count": 1, + "item": "deeperdarker:echo_fence_gate" }, "mainOutput": { "count": 2, - "item": "deeperdarker:echo_planks" + "id": "deeperdarker:echo_planks" }, "secondaryChance": 1.0, "secondaryOutput": { "count": 4, - "item": "minecraft:stick" + "id": "minecraft:stick" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/sawing/hanging_sign/echo.json b/src/main/resources/data/mekanism/recipe/sawing/hanging_sign/echo.json index c81108caf..33f7fa628 100644 --- a/src/main/resources/data/mekanism/recipe/sawing/hanging_sign/echo.json +++ b/src/main/resources/data/mekanism/recipe/sawing/hanging_sign/echo.json @@ -1,17 +1,17 @@ { "type": "mekanism:sawing", "input": { - "ingredient": { - "item": "deeperdarker:echo_hanging_sign" - } + "count": 1, + "item": "deeperdarker:echo_hanging_sign" }, "mainOutput": { "count": 2, - "item": "deeperdarker:echo_planks" + "id": "deeperdarker:echo_planks" }, "secondaryChance": 0.5, "secondaryOutput": { - "item": "mekanism:sawdust" + "count": 1, + "id": "mekanism:sawdust" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/sawing/log/echo.json b/src/main/resources/data/mekanism/recipe/sawing/log/echo.json index d4dccb9b1..3bd1fed35 100644 --- a/src/main/resources/data/mekanism/recipe/sawing/log/echo.json +++ b/src/main/resources/data/mekanism/recipe/sawing/log/echo.json @@ -1,17 +1,17 @@ { "type": "mekanism:sawing", "input": { - "ingredient": { - "tag": "deeperdarker:echo_logs" - } + "count": 1, + "tag": "deeperdarker:echo_logs" }, "mainOutput": { "count": 6, - "item": "deeperdarker:echo_planks" + "id": "deeperdarker:echo_planks" }, "secondaryChance": 0.25, "secondaryOutput": { - "item": "mekanism:sawdust" + "count": 1, + "id": "mekanism:sawdust" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/sawing/pressure_plate/echo.json b/src/main/resources/data/mekanism/recipe/sawing/pressure_plate/echo.json index 5b371637c..86862eb2d 100644 --- a/src/main/resources/data/mekanism/recipe/sawing/pressure_plate/echo.json +++ b/src/main/resources/data/mekanism/recipe/sawing/pressure_plate/echo.json @@ -1,13 +1,12 @@ { "type": "mekanism:sawing", "input": { - "ingredient": { - "item": "deeperdarker:echo_pressure_plate" - } + "count": 1, + "item": "deeperdarker:echo_pressure_plate" }, "mainOutput": { "count": 2, - "item": "deeperdarker:echo_planks" + "id": "deeperdarker:echo_planks" }, "neoforge:conditions": [ { diff --git a/src/main/resources/data/mekanism/recipe/sawing/trapdoor/echo.json b/src/main/resources/data/mekanism/recipe/sawing/trapdoor/echo.json index fc8fc5da6..4838d0d49 100644 --- a/src/main/resources/data/mekanism/recipe/sawing/trapdoor/echo.json +++ b/src/main/resources/data/mekanism/recipe/sawing/trapdoor/echo.json @@ -1,13 +1,12 @@ { "type": "mekanism:sawing", "input": { - "ingredient": { - "item": "deeperdarker:echo_trapdoor" - } + "count": 1, + "item": "deeperdarker:echo_trapdoor" }, "mainOutput": { "count": 3, - "item": "deeperdarker:echo_planks" + "id": "deeperdarker:echo_planks" }, "neoforge:conditions": [ {