From fed4df515ad7db85023709aa43a886893c91ea97 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 6 Mar 2020 01:09:10 +0100 Subject: [PATCH] Advancement & Recipe clean up - Clockwork Bearing no longer rotates counter-clockwise when facing certain directions - Nether Quartz can no longer be obtained from crushing Granite, Diorite or Andesite - Reorganized and Tweaked the current advancement chain - Removed unused values in recipe files - Caught up on Item Descriptions --- src/main/java/com/simibubi/create/Create.java | 4 +- .../advancement/AllCriterionTriggers.java | 27 ---- .../foundation/advancement/AllTriggers.java | 53 +++++++ .../advancement/SandpaperUseTrigger.java | 16 -- ...rgumentTrigger.java => SimpleTrigger.java} | 4 +- .../contraptions/base/KineticTileEntity.java | 4 + .../bearing/ClockworkBearingTileEntity.java | 6 +- .../deployer/DeployerTileEntity.java | 4 +- .../relays/gauge/SpeedGaugeTileEntity.java | 15 +- .../ChromaticCompoundCubeItem.java | 4 +- .../curiosities/tools/SandPaperItem.java | 4 +- .../resources/assets/create/lang/en_us.json | 148 ++++++++++++------ .../create/advancements/andesite_alloy.json | 2 +- .../create/advancements/andesite_casing.json | 3 +- .../create/advancements/brass_casing.json | 4 +- .../data/create/advancements/gear.json | 46 ------ .../create/advancements/overstressed.json | 24 +++ .../advancements/polished_rose_quartz.json | 2 +- .../create/advancements/refined_radiance.json | 2 +- .../data/create/advancements/root.json | 4 +- .../data/create/advancements/rotation.json | 23 +++ .../data/create/advancements/sand_paper.json | 4 +- .../advancements/sand_paper_secret.json | 2 +- .../create/advancements/shadow_steel.json | 3 +- .../create/advancements/speed_secret.json | 2 +- .../data/create/recipes/crushing/allium.json | 1 - .../create/recipes/crushing/andesite.json | 9 +- .../create/recipes/crushing/azure_bluet.json | 1 - .../create/recipes/crushing/blaze_rod.json | 1 - .../data/create/recipes/crushing/bone.json | 1 - .../create/recipes/crushing/bone_meal.json | 1 - .../data/create/recipes/crushing/cactus.json | 1 - .../create/recipes/crushing/charcoal.json | 1 - .../data/create/recipes/crushing/clay.json | 1 - .../data/create/recipes/crushing/coal.json | 1 - .../create/recipes/crushing/coal_ore.json | 1 - .../create/recipes/crushing/cobblestone.json | 1 - .../create/recipes/crushing/cocoa_beans.json | 1 - .../create/recipes/crushing/copper_ore.json | 1 - .../create/recipes/crushing/cornflower.json | 1 - .../create/recipes/crushing/dandelion.json | 1 - .../recipes/crushing/diamond_horse_armor.json | 1 - .../create/recipes/crushing/diamond_ore.json | 1 - .../data/create/recipes/crushing/diorite.json | 8 +- .../create/recipes/crushing/emerald_ore.json | 1 - .../data/create/recipes/crushing/fern.json | 1 - .../create/recipes/crushing/gold_ore.json | 1 - .../recipes/crushing/golden_horse_armor.json | 1 - .../data/create/recipes/crushing/granite.json | 8 +- .../data/create/recipes/crushing/grass.json | 1 - .../data/create/recipes/crushing/gravel.json | 1 - .../data/create/recipes/crushing/ink_sac.json | 1 - .../recipes/crushing/iron_horse_armor.json | 1 - .../create/recipes/crushing/iron_ore.json | 1 - .../create/recipes/crushing/lapis_lazuli.json | 1 - .../create/recipes/crushing/lapis_ore.json | 1 - .../create/recipes/crushing/large_fern.json | 1 - .../data/create/recipes/crushing/lilac.json | 1 - .../recipes/crushing/lily_of_the_valley.json | 1 - .../recipes/crushing/nether_quartz_ore.json | 1 - .../create/recipes/crushing/obsidian.json | 1 - .../create/recipes/crushing/orange_tulip.json | 1 - .../create/recipes/crushing/oxeye_daisy.json | 1 - .../data/create/recipes/crushing/peony.json | 1 - .../create/recipes/crushing/pink_tulip.json | 1 - .../data/create/recipes/crushing/poppy.json | 1 - .../recipes/crushing/prismarine_crystals.json | 1 - .../create/recipes/crushing/red_tulip.json | 1 - .../create/recipes/crushing/redstone_ore.json | 1 - .../create/recipes/crushing/rose_bush.json | 1 - .../data/create/recipes/crushing/saddle.json | 1 - .../data/create/recipes/crushing/sand.json | 1 - .../create/recipes/crushing/sugar_cane.json | 1 - .../create/recipes/crushing/sunflower.json | 1 - .../create/recipes/crushing/tall_grass.json | 1 - .../create/recipes/crushing/terracotta.json | 1 - .../data/create/recipes/crushing/wheat.json | 1 - .../create/recipes/crushing/white_tulip.json | 1 - .../create/recipes/crushing/wither_rose.json | 1 - .../data/create/recipes/crushing/wool.json | 1 - .../create/recipes/crushing/zinc_ore.json | 1 - .../create/recipes/cutting/acacia_log.json | 1 - .../recipes/cutting/andesite_alloy.json | 1 - .../create/recipes/cutting/birch_log.json | 1 - .../create/recipes/cutting/dark_oak_log.json | 1 - .../create/recipes/cutting/jungle_log.json | 1 - .../data/create/recipes/cutting/oak_log.json | 1 - .../create/recipes/cutting/spruce_log.json | 1 - .../recipes/cutting/stripped_acacia_log.json | 1 - .../recipes/cutting/stripped_birch_log.json | 1 - .../cutting/stripped_dark_oak_log.json | 1 - .../recipes/cutting/stripped_jungle_log.json | 1 - .../recipes/cutting/stripped_oak_log.json | 1 - .../recipes/cutting/stripped_spruce_log.json | 1 - .../create/recipes/mixing/andesite_alloy.json | 1 - .../recipes/mixing/andesite_alloy_1.json | 1 - .../create/recipes/mixing/brass_nugget.json | 1 - .../recipes/mixing/chromatic_compound.json | 1 - .../create/recipes/pressing/brass_ingot.json | 4 +- .../create/recipes/pressing/copper_ingot.json | 4 +- .../create/recipes/pressing/gold_ingot.json | 4 +- .../create/recipes/pressing/iron_ingot.json | 4 +- .../create/recipes/pressing/lapis_block.json | 1 - .../create/recipes/pressing/sugar_cane.json | 4 +- .../sandpaper_polishing/rose_quartz.json | 1 - .../splashing/black_concrete_powder.json | 4 +- .../splashing/blue_concrete_powder.json | 4 +- .../splashing/brown_concrete_powder.json | 4 +- .../data/create/recipes/splashing/bucket.json | 4 +- .../recipes/splashing/crushed_brass.json | 4 +- .../recipes/splashing/crushed_copper.json | 4 +- .../recipes/splashing/crushed_gold.json | 4 +- .../recipes/splashing/crushed_iron.json | 4 +- .../recipes/splashing/crushed_zinc.json | 4 +- .../splashing/cyan_concrete_powder.json | 4 +- .../data/create/recipes/splashing/flour.json | 4 +- .../data/create/recipes/splashing/gravel.json | 4 +- .../splashing/gray_concrete_powder.json | 4 +- .../splashing/green_concrete_powder.json | 4 +- .../data/create/recipes/splashing/ice.json | 4 +- .../splashing/light_blue_concrete_powder.json | 4 +- .../splashing/light_gray_concrete_powder.json | 4 +- .../splashing/lime_concrete_powder.json | 4 +- .../splashing/magenta_concrete_powder.json | 4 +- .../create/recipes/splashing/magma_block.json | 4 +- .../splashing/orange_concrete_powder.json | 4 +- .../splashing/pink_concrete_powder.json | 4 +- .../splashing/purple_concrete_powder.json | 4 +- .../splashing/red_concrete_powder.json | 4 +- .../create/recipes/splashing/red_sand.json | 1 - .../data/create/recipes/splashing/sand.json | 4 +- .../create/recipes/splashing/soul_sand.json | 4 +- .../recipes/splashing/stained_glass.json | 4 +- .../recipes/splashing/stained_glass_pane.json | 4 +- .../splashing/white_concrete_powder.json | 4 +- .../data/create/recipes/splashing/wool.json | 4 +- .../splashing/yellow_concrete_powder.json | 4 +- 137 files changed, 275 insertions(+), 377 deletions(-) delete mode 100644 src/main/java/com/simibubi/create/foundation/advancement/AllCriterionTriggers.java create mode 100644 src/main/java/com/simibubi/create/foundation/advancement/AllTriggers.java rename src/main/java/com/simibubi/create/foundation/advancement/{NoArgumentTrigger.java => SimpleTrigger.java} (85%) delete mode 100644 src/main/resources/data/create/advancements/gear.json create mode 100644 src/main/resources/data/create/advancements/overstressed.json create mode 100644 src/main/resources/data/create/advancements/rotation.json diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 1a2b2a2d2..5fe815d27 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -1,6 +1,6 @@ package com.simibubi.create; -import com.simibubi.create.foundation.advancement.AllCriterionTriggers; +import com.simibubi.create.foundation.advancement.AllTriggers; import net.minecraft.util.SoundEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -72,7 +72,7 @@ public class Create { CraftingHelper.register(new ModuleLoadedCondition.Serializer()); AllPackets.registerPackets(); - AllCriterionTriggers.register(); + AllTriggers.register(); } public static void serverStarting(FMLServerStartingEvent event) { diff --git a/src/main/java/com/simibubi/create/foundation/advancement/AllCriterionTriggers.java b/src/main/java/com/simibubi/create/foundation/advancement/AllCriterionTriggers.java deleted file mode 100644 index 59d65fcf3..000000000 --- a/src/main/java/com/simibubi/create/foundation/advancement/AllCriterionTriggers.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.simibubi.create.foundation.advancement; - -import net.minecraft.advancements.CriteriaTriggers; - -import java.util.LinkedList; -import java.util.List; - -public class AllCriterionTriggers { - - private static List> triggers = new LinkedList<>(); - - public static SandpaperUseTrigger SANDPAPER_USE = add(new SandpaperUseTrigger("sandpaper_use")); - public static NoArgumentTrigger DEPLOYER_BOOP = add(new NoArgumentTrigger("deployer")); - public static NoArgumentTrigger ABSORBED_LIGHT = add(new NoArgumentTrigger("light_absorbed")); - public static NoArgumentTrigger SPEED_READ = add(new NoArgumentTrigger("speed_read")); - - private static > T add(T instance) { - triggers.add(instance); - return instance; - } - - public static void register(){ - triggers.forEach(CriteriaTriggers::register); - } - - -} diff --git a/src/main/java/com/simibubi/create/foundation/advancement/AllTriggers.java b/src/main/java/com/simibubi/create/foundation/advancement/AllTriggers.java new file mode 100644 index 000000000..cb8ae3705 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/advancement/AllTriggers.java @@ -0,0 +1,53 @@ +package com.simibubi.create.foundation.advancement; + +import java.util.LinkedList; +import java.util.List; +import java.util.function.Predicate; + +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class AllTriggers { + + private static List> triggers = new LinkedList<>(); + + public static SandpaperUseTrigger SANDPAPER_USE = add(new SandpaperUseTrigger("sandpaper_use")); + public static SimpleTrigger DEPLOYER_BOOP = simple("deployer"); + public static SimpleTrigger ABSORBED_LIGHT = simple("light_absorbed"); + public static SimpleTrigger SPEED_READ = simple("speed_read"); + public static SimpleTrigger OVERSTRESSED = simple("overstressed"); + public static SimpleTrigger ROTATION = simple("rotation"); + + private static SimpleTrigger simple(String id) { + return add(new SimpleTrigger(id)); + } + + private static > T add(T instance) { + triggers.add(instance); + return instance; + } + + public static void register() { + triggers.forEach(CriteriaTriggers::register); + } + + public static void triggerForNearbyPlayers(SimpleTrigger trigger, World world, BlockPos pos, int range) { + triggerForNearbyPlayers(trigger, world, pos, range, player -> true); + } + + public static void triggerForNearbyPlayers(SimpleTrigger trigger, World world, BlockPos pos, int range, + Predicate playerFilter) { + if (world == null) + return; + if (world.isRemote) + return; + List players = + world.getEntitiesWithinAABB(ServerPlayerEntity.class, new AxisAlignedBB(pos).grow(range)); + players.stream().filter(playerFilter).forEach(trigger::trigger); + } + +} diff --git a/src/main/java/com/simibubi/create/foundation/advancement/SandpaperUseTrigger.java b/src/main/java/com/simibubi/create/foundation/advancement/SandpaperUseTrigger.java index 91dde29d5..dcf3d0bc2 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/SandpaperUseTrigger.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/SandpaperUseTrigger.java @@ -24,22 +24,6 @@ public class SandpaperUseTrigger extends CriterionTriggerBase target, () -> result)); - - /*PlayerAdvancements playerAdvancements = player.getAdvancements(); - Set> playerListeners = this.listeners.get(playerAdvancements); - if (playerListeners != null){ - List> list = new LinkedList<>(); - - for (Listener listener : - playerListeners) { - if (listener.getCriterionInstance().test(target, result)) { - list.add(listener); - } - } - - list.forEach(listener -> listener.grantCriterion(playerAdvancements)); - - }*/ } public static class Instance extends CriterionTriggerBase.Instance { diff --git a/src/main/java/com/simibubi/create/foundation/advancement/NoArgumentTrigger.java b/src/main/java/com/simibubi/create/foundation/advancement/SimpleTrigger.java similarity index 85% rename from src/main/java/com/simibubi/create/foundation/advancement/NoArgumentTrigger.java rename to src/main/java/com/simibubi/create/foundation/advancement/SimpleTrigger.java index 98819e158..c3ef01e1e 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/NoArgumentTrigger.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/SimpleTrigger.java @@ -8,9 +8,9 @@ import net.minecraft.util.ResourceLocation; import java.util.List; import java.util.function.Supplier; -public class NoArgumentTrigger extends CriterionTriggerBase { +public class SimpleTrigger extends CriterionTriggerBase { - public NoArgumentTrigger(String id) { + public SimpleTrigger(String id) { super(id); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java index 3d3eae57c..4184e508a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java @@ -11,6 +11,7 @@ import java.util.UUID; import com.simibubi.create.Create; import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.foundation.utility.VecHelper; @@ -74,6 +75,8 @@ public abstract class KineticTileEntity extends SmartTileEntity implements ITick this.currentStress = currentStress; boolean overStressed = maxStress < currentStress && StressImpact.isEnabled(); if (overStressed != this.overStressed) { + if (speed != 0 && overStressed) + AllTriggers.triggerForNearbyPlayers(AllTriggers.OVERSTRESSED, world, pos, 8); float prevSpeed = getSpeed(); this.overStressed = overStressed; onSpeedChanged(prevSpeed); @@ -403,6 +406,7 @@ public abstract class KineticTileEntity extends SmartTileEntity implements ITick particleSpeed *= Math.signum(getSpeed()); if (getWorld() instanceof ServerWorld) { + AllTriggers.triggerForNearbyPlayers(AllTriggers.ROTATION, world, pos, 5); RotationIndicatorParticleData particleData = new RotationIndicatorParticleData(color, particleSpeed, radius1, radius2, 10, axisChar); ((ServerWorld) getWorld()).spawnParticle(particleData, vec.x, vec.y, vec.z, 20, 0, 0, 0, 1); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingTileEntity.java index 448893d00..618675dd3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingTileEntity.java @@ -109,7 +109,8 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe if (speed != 0) { int dayTime = (int) (world.getDayTime() % 24000); int hours = (dayTime / 1000 + 6) % 24; - float hourTarget = (float) (-360 / 12f * (hours % 12)); + int offset = getBlockState().get(ClockworkBearingBlock.FACING).getAxisDirection().getOffset(); + float hourTarget = (float) (offset * -360 / 12f * (hours % 12)); speed = Math.max(speed, AngleHelper.getShortestAngleDiff(hourAngle, hourTarget)); } @@ -122,7 +123,8 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe if (speed != 0) { int dayTime = (int) (world.getDayTime() % 24000); int minutes = (dayTime % 1000) * 60 / 1000; - float hourTarget = (float) (-360 / 60f * (minutes)); + int offset = getBlockState().get(ClockworkBearingBlock.FACING).getAxisDirection().getOffset(); + float hourTarget = (float) (offset * -360 / 60f * (minutes)); speed = Math.max(speed, AngleHelper.getShortestAngleDiff(minuteAngle, hourTarget)); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java index af449a658..9a8c64649 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java @@ -13,7 +13,7 @@ import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.advancement.AllCriterionTriggers; +import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.behaviour.inventory.ExtractingBehaviour; @@ -247,7 +247,7 @@ public class DeployerTileEntity extends KineticTileEntity { // award nearby players List players = world.getEntitiesWithinAABB(ServerPlayerEntity.class, new AxisAlignedBB(pos).grow(9)); - players.forEach(AllCriterionTriggers.DEPLOYER_BOOP::trigger); + players.forEach(AllTriggers.DEPLOYER_BOOP::trigger); } protected void activate() { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java index 6a2df8656..c22d09532 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java @@ -2,17 +2,13 @@ package com.simibubi.create.modules.contraptions.relays.gauge; import com.simibubi.create.AllTileEntities; import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.advancement.AllCriterionTriggers; +import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.modules.contraptions.GogglesItem; import com.simibubi.create.modules.contraptions.base.IRotate.SpeedLevel; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; -import java.util.List; - public class SpeedGaugeTileEntity extends GaugeTileEntity { public SpeedGaugeTileEntity() { @@ -28,12 +24,9 @@ public class SpeedGaugeTileEntity extends GaugeTileEntity { float max = AllConfigs.SERVER.kinetics.maxRotationSpeed.get().floatValue(); color = ColorHelper.mixColors(SpeedLevel.of(speed).getColor(), 0xffffff, .25f); - if (speed == 666){ - assert world != null; - List players = world.getEntitiesWithinAABB(ServerPlayerEntity.class, new AxisAlignedBB(pos).grow(6)); - players.stream().filter(GogglesItem::canSeeParticles).forEach(AllCriterionTriggers.SPEED_READ::trigger); - } - + if (speed == 69) + AllTriggers.triggerForNearbyPlayers(AllTriggers.SPEED_READ, world, pos, 6, + GogglesItem::canSeeParticles); if (speed == 0) { dialTarget = 0; color = 0x333333; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/ChromaticCompoundCubeItem.java b/src/main/java/com/simibubi/create/modules/curiosities/ChromaticCompoundCubeItem.java index 88dd21499..13733e007 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/ChromaticCompoundCubeItem.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/ChromaticCompoundCubeItem.java @@ -6,7 +6,7 @@ import java.util.Random; import com.simibubi.create.AllItems; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.config.CCuriosities; -import com.simibubi.create.foundation.advancement.AllCriterionTriggers; +import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.item.IItemWithColorHandler; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.ColorHelper; @@ -159,7 +159,7 @@ public class ChromaticCompoundCubeItem extends Item implements IItemWithColorHan entity.setItem(newStack); List players = world.getEntitiesWithinAABB(ServerPlayerEntity.class, new AxisAlignedBB(entity.getPosition()).grow(8)); - players.forEach(AllCriterionTriggers.ABSORBED_LIGHT::trigger); + players.forEach(AllTriggers.ABSORBED_LIGHT::trigger); return false; } diff --git a/src/main/java/com/simibubi/create/modules/curiosities/tools/SandPaperItem.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/SandPaperItem.java index e4671002e..64732c7fb 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/tools/SandPaperItem.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/tools/SandPaperItem.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.curiosities.tools; -import com.simibubi.create.foundation.advancement.AllCriterionTriggers; +import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; import com.simibubi.create.foundation.item.IHaveCustomItemModel; import com.simibubi.create.foundation.utility.VecHelper; @@ -135,7 +135,7 @@ public class SandPaperItem extends Item implements IHaveCustomItemModel { if (player instanceof DeployerFakePlayer) { player.dropItem(polished, false, false); } else { - AllCriterionTriggers.SANDPAPER_USE.trigger((ServerPlayerEntity) player, toPolish, polished); + AllTriggers.SANDPAPER_USE.trigger((ServerPlayerEntity) player, toPolish, polished); player.inventory.placeItemBackInInventory(worldIn, polished); } diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index 2ddb73034..df0d95a12 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -604,50 +604,52 @@ "create.command.killTPSCommand": "killtps", "create.command.killTPSCommand.status.slowed_by.0": "[Create]: Server tick is currently slowed by %s ms", - "create.command.killTPSCommand.status.slowed_by.1": "[Create]: Server tick is slowed by %s ms now :)", + "create.command.killTPSCommand.status.slowed_by.1": "[Create]: Server tick is slowed by %s ms now >:)", "create.command.killTPSCommand.status.slowed_by.2": "[Create]: Server tick is back to regular speed", "create.command.killTPSCommand.status.usage.0": "[Create]: use /killtps stop to bring back server tick to regular speed", "create.command.killTPSCommand.status.usage.1": "[Create]: use /killtps start to artificially slow down the server tick", "create.command.killTPSCommand.argument.tickTime": "tickTime", - "advancement.create:root": "Create Advancements", - "advancement.create:root.desc": "~ Root Description", - "advancement.create:andesite_alloy": "Andesite Alloy", - "advancement.create:andesite_alloy.desc": "A basic building block of Create", - "advancement.create:andesite_casing": "Andesite Casing", + "advancement.create:root": "The beginning of Create", + "advancement.create:root.desc": "It's time to start building some amazing Contraptions!", + "advancement.create:andesite_alloy": "Alliterations Aplenty", + "advancement.create:andesite_alloy.desc": "Create's materials have weird names, Andesite Alloy is one of them.", + "advancement.create:andesite_casing": "The Andesite Age ", "advancement.create:andesite_casing.desc": "Use some Andesite, Metal and Wood to create a basic Casing", - "advancement.create:crushing_wheel": "I've got a crush on you", - "advancement.create:crushing_wheel.desc": "Create a pair of Crushing Wheels", - "advancement.create:gear": "Know what really grinds my Gears?", - "advancement.create:gear.desc": "~ Oh you don't care? Fine then..", - "advancement.create:sand_paper": "Sand Paper", - "advancement.create:sand_paper.desc": "~ Description", - "advancement.create:polished_rose_quartz": "Polished Rose Quartz", - "advancement.create:polished_rose_quartz.desc": "~ Description", - "advancement.create:sand_paper_secret": "Sandier Paper?", + "advancement.create:crushing_wheel": "A Pair of Giants", + "advancement.create:crushing_wheel.desc": "Create some Crushing Wheels for breaking down materials.", + "advancement.create:rotation": "It's Alive", + "advancement.create:rotation.desc": "Watch your first kinetic component spin.", + "advancement.create:overstressed": "Overstressed", + "advancement.create:overstressed.desc": "Experience the laws of physics firsthand.", + "advancement.create:sand_paper": "Power Polish", + "advancement.create:sand_paper.desc": "Create some Sand Paper", + "advancement.create:polished_rose_quartz": "Pink Diamonds", + "advancement.create:polished_rose_quartz.desc": "Polish Rose Quartz until you can see through it.", + "advancement.create:sand_paper_secret": "From Polisher to Polishee", "advancement.create:sand_paper_secret.desc": "Use your Sand Paper to sand some Sand Paper", - "advancement.create:press": "Squeezing real hard", + "advancement.create:press": "'Bonk!' ", "advancement.create:press.desc": "Make a Mechanical Press and use it to create some Plates", - "advancement.create:mixer": "Don't get this mixed up!", - "advancement.create:mixer.desc": "Make a Mechanical Mixer", - "advancement.create:brass": "Brass", - "advancement.create:brass.desc": "~ Description", - "advancement.create:brass_casing": "Brass Casing", - "advancement.create:brass_casing.desc": "~ Description", - "advancement.create:deployer": "Deployer", - "advancement.create:deployer.desc": "~ Description", + "advancement.create:mixer": "Mixin' it up", + "advancement.create:mixer.desc": "Create a Mechanical Mixer", + "advancement.create:brass": "An actual Alloy", + "advancement.create:brass.desc": "Use Copper and Zinc to create some Brass", + "advancement.create:brass_casing": "The Brass Age", + "advancement.create:brass_casing.desc": "Use your newly obtained Brass and some Wood to create a more advanced Casing", + "advancement.create:deployer": "Poke, Place and Attack", + "advancement.create:deployer.desc": "Create a Deployer, the perfect reflection of yourself.", "advancement.create:deployer_secret": "Pound it, brother", - "advancement.create:deployer_secret.desc": "~ Description", - "advancement.create:chromatic_compound": "Chromatic Compound", - "advancement.create:chromatic_compound.desc": "~ Description", - "advancement.create:shadow_steel": "Not quite as Shiny", - "advancement.create:shadow_steel.desc": "~ Description", - "advancement.create:refined_radiance": "SHINY!!", - "advancement.create:refined_radiance.desc": "~ Description", - "advancement.create:refined_radiance_secret": "~ Name", + "advancement.create:deployer_secret.desc": "Make two Deployers bump their fists.", + "advancement.create:chromatic_compound": "Bipolar Materials", + "advancement.create:chromatic_compound.desc": "Craft a Bar of Chromatic Compound.", + "advancement.create:shadow_steel": "Returned from the Void", + "advancement.create:shadow_steel.desc": "Create Shadow Steel, a metal bar of emptiness.", + "advancement.create:refined_radiance": "Bright and Inspiring", + "advancement.create:refined_radiance.desc": "Create Refined Radiance, a powerful chromatic substance.", + "advancement.create:refined_radiance_secret": "Forged by the Beam of Light", "advancement.create:refined_radiance_secret.desc": "Find the alternative way to make Refined Radiance", - "advancement.create:speed_secret": "Hella fast", - "advancement.create:speed_secret.desc": "Watch a Speedometer reach exactly 666 speed", + "advancement.create:speed_secret": "Nice ", + "advancement.create:speed_secret.desc": "Watch a Speedometer reach exactly 69rpm", "create.subtitle.schematicannon_launch_block": "Schematicannon shoots", "create.subtitle.schematicannon_finish": "Schematicannon finishes", @@ -704,6 +706,9 @@ "item.create.tree_fertilizer.tooltip.condition1": "When used on Sapling", "item.create.tree_fertilizer.tooltip.behaviour1": "Grows Trees _regardless_ of their _spacing_ _conditions_", + "item.create.deforester.tooltip": "DEFORESTER", + "item.create.deforester.tooltip.summary": "A _radiant_ _axe_ able to cut down trees in a split second.", + "item.create.filter.tooltip": "FILTER", "item.create.filter.tooltip.summary": "_Controls_ _outputs_ and inputs of logistical devices with more _precision,_ matching them against a _set_ _of_ _items_ or several _nested_ _filters._", "item.create.filter.tooltip.condition1": "When in filter slot", @@ -888,14 +893,24 @@ "block.create.flywheel.tooltip.summary": "A large metal wheel to _harness_ _and_ _stabilize_ generated force by an _attached_ _Engine._ Flywheels connect to engines if they are _1m_ _apart_ and at a _90°_ _Angle_ from each other.", "block.create.flywheel.tooltip.condition1": "When Attached to Running Engine", "block.create.flywheel.tooltip.behaviour1": "Provides _Rotational_ _Force_ to a connected contraption based on the generators strength and speed.", + + "block.create.portable_storage_interface.tooltip": "PORTABLE STORAGE INTERFACE", + "block.create.portable_storage_interface.tooltip.summary": "A portable interchange point for _moving_ _items_ to and from a _structure_ moved by a piston, bearing, minecart or pulley.", + "block.create.portable_storage_interface.tooltip.condition1": "While Moving", + "block.create.portable_storage_interface.tooltip.behaviour1": "Interacts with stationary _transposers,_ such that transposers _facing_ _away_ from the interface _pull_ _items_ and transposers targeting the interface will _insert_ _items_ from their attached inventory. The contraption will briefly stall as items are being exchanged.", + + "block.create.rotation_speed_controller.tooltip": "ROTATION SPEED CONTROLLER", + "block.create.rotation_speed_controller.tooltip.summary": "A _configurable_ _relay_ able to speed up or slow down the target component to any desired speed.", + "block.create.rotation_speed_controller.tooltip.condition1": "When Attached to Large Cogwheel", + "block.create.rotation_speed_controller.tooltip.behaviour1": "Relays incoming rotational force to the wheel, trying to _match_ the _speed_ it is configured to target. The _cogwheel_ has to be _attached_ _on_ _top_ of the controller.", "block.create.mechanical_piston.tooltip": "MECHANICAL PISTON", - "block.create.mechanical_piston.tooltip.summary": "A more advanced version of the _Piston,_ using _Rotational_ _Force_ to precisely move attached structures. _Piston_ _Extension_ _Poles_ at the rear define the _Range_ of this Device. Without extensions, the piston will not move. Use _Chassis_ to move more than a single line of blocks.", + "block.create.mechanical_piston.tooltip.summary": "A more advanced version of the _Piston,_ using _Rotational_ _Force_ to precisely move attached structures. _Piston_ _Extension_ _Poles_ at the rear define the _Range_ of this Device. Without extensions, the piston will not move. Use _Chassis_ or _Slime_ _Blocks_ to move more than a single line of blocks.", "block.create.mechanical_piston.tooltip.condition1": "When Rotated", "block.create.mechanical_piston.tooltip.behaviour1": "Starts moving the attached structure. Speed and direction correlate to the incoming Rotation Speed.", "block.create.sticky_mechanical_piston.tooltip": "STICKY MECHANICAL PISTON", - "block.create.sticky_mechanical_piston.tooltip.summary": "A more advanced version of the _Sticky_ _Piston,_ using _Rotational_ _Force_ to precisely move attached structures. _Piston_ _Extension_ _Poles_ at the rear define the _Range_ of this Device. Without extensions, the piston will not move. Use _Chassis_ to move more than a single line of blocks.", + "block.create.sticky_mechanical_piston.tooltip.summary": "A more advanced version of the _Sticky_ _Piston,_ using _Rotational_ _Force_ to precisely move attached structures. _Piston_ _Extension_ _Poles_ at the rear define the _Range_ of this Device. Without extensions, the piston will not move. Use _Chassis_ or _Slime_ _Blocks_ to move more than a single line of blocks.", "block.create.sticky_mechanical_piston.tooltip.condition1": "When Rotated", "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Starts moving the attached structure. Speed and direction correlate to the incoming Rotation Speed.", @@ -907,9 +922,24 @@ "block.create.mechanical_bearing.tooltip": "MECHANICAL BEARING", "block.create.mechanical_bearing.tooltip.summary": "Used for rotating _larger_ _structures_ or generating _Rotational_ _Force_ from wind.", "block.create.mechanical_bearing.tooltip.condition1": "When Rotated", - "block.create.mechanical_bearing.tooltip.behaviour1": "Starts physically rotating attached _Rotation_ _Chassis_ and their attached blocks respectively.", + "block.create.mechanical_bearing.tooltip.behaviour1": "Starts rotating attached blocks. Use _Chassis_ or _Slime_ _Blocks_ to move more than a single block.", "block.create.mechanical_bearing.tooltip.condition2": "When Powered by Redstone", "block.create.mechanical_bearing.tooltip.behaviour2": "Starts providing _Rotational_ _Force_ from rotating its attached structure. The Structure has to include suitable _Sail_ _Blocks_ (Currently any Wool Block).", + + "block.create.clockwork_bearing.tooltip": "CLOCKWORK BEARING", + "block.create.clockwork_bearing.tooltip.summary": "An advanced version of the _Mechanical_ _Bearing_ for rotating up to two _clock_ _hands_ according to current _in-game_ _time._", + "block.create.clockwork_bearing.tooltip.condition1": "When Rotated", + "block.create.clockwork_bearing.tooltip.behaviour1": "Starts rotating the attached Structure towards the _current_ _hour._ If a second structure is present, it will serve as the _minute_ _hand._", + + "block.create.cart_assembler.tooltip": "CART ASSEMBLER", + "block.create.cart_assembler.tooltip.summary": "Mounts a connected Structure onto a _passing_ _Minecart._", + "block.create.cart_assembler.tooltip.condition1": "When Powered by Redstone", + "block.create.cart_assembler.tooltip.behaviour1": "_Disassembles_ mounted Structures of _passing_ _carts_ and places them back into the world.", + + "block.create.rope_pulley.tooltip": "ROPE PULLEY", + "block.create.rope_pulley.tooltip.summary": "Moves attached _blocks_ and _structures_ _vertically._ Use _Chassis_ or _Slime_ _Blocks_ to move more than a single block.", + "block.create.rope_pulley.tooltip.condition1": "When Rotated", + "block.create.rope_pulley.tooltip.behaviour1": "Starts moving the attached structure. Speed and direction correlate to the incoming Rotation Speed.", "block.create.translation_chassis.tooltip": "TRANSLATION CHASSIS", "block.create.translation_chassis.tooltip.summary": "A configurable base block connecting structures for movement.", @@ -930,23 +960,25 @@ "block.create.rotation_chassis.tooltip.action1": "Makes the clicked face _Sticky._ When the Chassis gets moved, all blocks attached to this side will be moved with it.", "block.create.drill.tooltip": "MECHANICAL DRILL", - "block.create.drill.tooltip.summary": "A mechanical device suitable for _breaking_ _blocks._", + "block.create.drill.tooltip.summary": "A mechanical device suitable for _breaking_ _blocks._ You can also move it around using _Mechanical_ _Pistons_ or _Bearings._", "block.create.drill.tooltip.condition1": "When Rotated", "block.create.drill.tooltip.behaviour1": "Acts as a _stationary_ Block Breaker. Also _hurts_ _entities_ in its effective area.", - "block.create.drill.tooltip.condition2": "When Pushed by Mechanical Piston", + "block.create.drill.tooltip.condition2": "While Moving", "block.create.drill.tooltip.behaviour2": "Breaks Blocks the drill is running into.", "block.create.harvester.tooltip": "MECHANICAL HARVESTER", - "block.create.harvester.tooltip.summary": "A mechanical plant cutter suitable for medium scale crop automation", - "block.create.harvester.tooltip.condition1": "When Pushed by Mechanical Piston", + "block.create.harvester.tooltip.summary": "A mechanical plant cutter suitable for medium scale crop automation. You can move it around using _Mechanical_ _Pistons_ or _Bearings._", + "block.create.harvester.tooltip.condition1": "While Moving", "block.create.harvester.tooltip.behaviour1": "_Harvests_ all _mature_ _crops_ the blade is running into, and resets them to their initial growth state.", "block.create.saw.tooltip": "MECHANICAL SAW", - "block.create.saw.tooltip.summary": "Suitable for _cutting_ _trees_ effectively and for _cutting_ _blocks_ into their carpentered counterparts.", + "block.create.saw.tooltip.summary": "Suitable for _cutting_ _trees_ effectively and for _cutting_ _blocks_ into their carpentered counterparts. You can also move it around using _Mechanical_ _Pistons_ or _Bearings._", "block.create.saw.tooltip.condition1": "When facing up", "block.create.saw.tooltip.behaviour1": "Applies _Sawing_ and _Stonecutting_ _Recipes_ to items dropped onto or inserted into it. When multiple outputs are possible, it cycles through them unless a _filter_ is assigned.", "block.create.saw.tooltip.condition2": "When facing horizonally", "block.create.saw.tooltip.behaviour2": "_Breaks_ _logs_ in front of it. If the log supported a tree on its own, the _tree_ _will_ _collapse_ away from the saw.", + "block.create.saw.tooltip.condition3": "While Moving", + "block.create.saw.tooltip.behaviour3": "_Cuts_ all _Trees_ the saw is running into.", "block.create.stockswitch.tooltip": "STOCKSWITCH", "block.create.stockswitch.tooltip.summary": "Toggles a Redstone signal based on the _Storage_ _Space_ in the attached Container.", @@ -967,11 +999,11 @@ "block.create.redstone_bridge.tooltip.action2": "Toggles between _Receiver_ and _Transmitter_ Mode.", "block.create.contact.tooltip": "REDSTONE CONTACT", - "block.create.contact.tooltip.summary": "A simple device for advanced Redstone Contraptions.", + "block.create.contact.tooltip.summary": "Emits redstone power only in pairs. You can also move it around using _Mechanical_ _Pistons_ or _Bearings._", "block.create.contact.tooltip.condition1": "When facing other Contact", "block.create.contact.tooltip.behaviour1": "Provides a _Redstone_ _Signal_", - "block.create.contact.tooltip.condition2": "When moved by Mechanical Piston", - "block.create.contact.tooltip.behaviour2": "Triggers all stationary Contacts passing by", + "block.create.contact.tooltip.condition2": "While Moving", + "block.create.contact.tooltip.behaviour2": "Triggers all stationary Contacts passed by", "block.create.flexcrate.tooltip": "ADJUSTABLE CRATE", "block.create.flexcrate.tooltip.summary": "This _Storage_ _Container_ allows Manual control over its capacity. It can hold up to _16_ _Stacks_ of any Item", @@ -983,7 +1015,14 @@ "block.create.extractor.tooltip.condition1": "When Powered by Redstone", "block.create.extractor.tooltip.behaviour1": "_Pauses_ the Extractor", "block.create.extractor.tooltip.control1": "R-Click on Filter Space", - "block.create.extractor.tooltip.action1": "Assigns currently _held_ _stack_ as the _Filter._ Extractor will pull the item _type_ and _count_ of the filter stack exclusively.", + "block.create.extractor.tooltip.action1": "Assigns currently _held_ _stack_ as the _Filter._ The Extractor will pull the item _type_ and _count_ of the filter stack exclusively.", + + "block.create.transposer.tooltip": "TRANSPOSER", + "block.create.transposer.tooltip.summary": "_Takes_ _items_ from an attached _Inventory_ and immediately puts them into the target _Inventory._ Can be assigned an item-stack as a _filter._", + "block.create.transposer.tooltip.condition1": "When Powered by Redstone", + "block.create.transposer.tooltip.behaviour1": "_Pauses_ the Transposer", + "block.create.transposer.tooltip.control1": "R-Click on Filter Space", + "block.create.transposer.tooltip.action1": "Assigns currently _held_ _stack_ as the _Filter._ The Transposer will pull the item _type_ and _count_ of the filter stack exclusively.", "block.create.deployer.tooltip": "DEPLOYER", "block.create.deployer.tooltip.summary": "_Punches,_ _Uses_ and _Activates._ This machine will try to _imitate_ a _player_ as good as it's able to. Can _Take_ and _Deposit_ _items_ at an adjacent _Inventory._ Can be assigned an item-stack as a _filter._", @@ -997,9 +1036,18 @@ "block.create.linked_extractor.tooltip.condition1": "When Redstone Link Active", "block.create.linked_extractor.tooltip.behaviour1": "_Pauses_ the Extractor", "block.create.linked_extractor.tooltip.control1": "R-Click on Filter Space", - "block.create.linked_extractor.tooltip.action1": "Assigns currently _held_ _stack_ as the _Filter._ Extractor will pull the item _type_ and _count_ of the filter stack exclusively.", + "block.create.linked_extractor.tooltip.action1": "Assigns currently _held_ _stack_ as the _Filter._ The Extractor will pull the item _type_ and _count_ of the filter stack exclusively.", "block.create.linked_extractor.tooltip.control2": "R-Click on Frequency Space", "block.create.linked_extractor.tooltip.action2": "Assigns currently _held_ _item_ as part of the Frequency listened on. Whenever a transmitting _Redstone_ _Link_ of the same frequency is powered, this Extractor will pause.", + + "block.create.linked_transposer.tooltip": "LINKED TRANSPOSER", + "block.create.linked_transposer.tooltip.summary": "_Takes_ _items_ from an attached _Inventory_ and immediately puts them into the target _Inventory._ Can be assigned an item-stack as a _filter._ Can be controlled remotely via a _Redstone_ _Link._", + "block.create.linked_transposer.tooltip.condition1": "When Redstone Link Active", + "block.create.linked_transposer.tooltip.behaviour1": "_Pauses_ the Transposer", + "block.create.linked_transposer.tooltip.control1": "R-Click on Filter Space", + "block.create.linked_transposer.tooltip.action1": "Assigns currently _held_ _stack_ as the _Filter._ The Transposer will pull the item _type_ and _count_ of the filter stack exclusively.", + "block.create.linked_transposer.tooltip.control2": "R-Click on Frequency Space", + "block.create.linked_transposer.tooltip.action2": "Assigns currently _held_ _item_ as part of the Frequency listened on. Whenever a transmitting _Redstone_ _Link_ of the same frequency is powered, this Transposer will pause.", "block.create.belt_funnel.tooltip": "FUNNEL", "block.create.belt_funnel.tooltip.summary": "_Collects_ _incoming_ _items_ and inserts them into the attached _Inventory_ if possible. Can collect items in the _world_ and items on a _belt._", @@ -1038,6 +1086,12 @@ "block.create.analog_lever.tooltip": "ANALOG LEVER", "block.create.analog_lever.tooltip.summary": "A lever with more _precise_ _control_ over its emitted _signal_ _strength._", + + "block.create.toggle_latch.tooltip": "POWERED TOGGLE LATCH", + "block.create.toggle_latch.tooltip.summary": "A lever that can be toggled by a _Redstone_ _Pulse._", + + "block.create.redstone_latch.tooltip": "POWERED LATCH", + "block.create.redstone_latch.tooltip.summary": "A lever that can be controlled by _Redstone_ _Signals._ A signal on the _back_ _enables_ it, a signal from the _side_ _will_ _reset_ it.", "block.create.speed_gauge.tooltip": "SPEEDOMETER", "block.create.speed_gauge.tooltip.summary": "Measures and displays the _rotational_ _speed_ of attached kinetic components.", diff --git a/src/main/resources/data/create/advancements/andesite_alloy.json b/src/main/resources/data/create/advancements/andesite_alloy.json index 2eb334beb..82a8a22b1 100644 --- a/src/main/resources/data/create/advancements/andesite_alloy.json +++ b/src/main/resources/data/create/advancements/andesite_alloy.json @@ -10,7 +10,7 @@ "item": "create:andesite_alloy" }, "frame": "task", - "show_toast": false, + "show_toast": true, "announce_to_chat": false, "hidden": true }, diff --git a/src/main/resources/data/create/advancements/andesite_casing.json b/src/main/resources/data/create/advancements/andesite_casing.json index ccf09422d..0d2396e9f 100644 --- a/src/main/resources/data/create/advancements/andesite_casing.json +++ b/src/main/resources/data/create/advancements/andesite_casing.json @@ -1,8 +1,7 @@ { "display": { "title": { - "translate": "advancement.create:andesite_casing", - "color": "gray" + "translate": "advancement.create:andesite_casing" }, "description": { "translate": "advancement.create:andesite_casing.desc" diff --git a/src/main/resources/data/create/advancements/brass_casing.json b/src/main/resources/data/create/advancements/brass_casing.json index 27ceca47f..a91749db6 100644 --- a/src/main/resources/data/create/advancements/brass_casing.json +++ b/src/main/resources/data/create/advancements/brass_casing.json @@ -1,10 +1,10 @@ { "display": { "title": { - "text": "brass_casing" + "translate": "advancement.create:brass_casing" }, "description": { - "text": "Description" + "translate": "advancement.create:brass_casing.desc" }, "icon": { "item": "create:brass_casing" diff --git a/src/main/resources/data/create/advancements/gear.json b/src/main/resources/data/create/advancements/gear.json deleted file mode 100644 index 1c8ca2406..000000000 --- a/src/main/resources/data/create/advancements/gear.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "display": { - "title": { - "translate": "advancement.create:gear" - }, - "description": { - "translate": "advancement.create:gear.desc" - }, - "icon": { - "item": "create:cogwheel" - }, - "frame": "task", - "show_toast": true, - "announce_to_chat": false, - "hidden": true - }, - "criteria": { - "gearSmall": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "create:cogwheel" - } - ] - } - }, - "gearBig": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "create:large_cogwheel" - } - ] - } - } - }, - "requirements": [ - [ - "gearSmall", - "gearBig" - ] - ], - "parent": "create:andesite_alloy" -} \ No newline at end of file diff --git a/src/main/resources/data/create/advancements/overstressed.json b/src/main/resources/data/create/advancements/overstressed.json new file mode 100644 index 000000000..614d5d50c --- /dev/null +++ b/src/main/resources/data/create/advancements/overstressed.json @@ -0,0 +1,24 @@ +{ + "display": { + "title": { + "translate": "advancement.create:overstressed", + "color": "red" + }, + "description": { + "translate": "advancement.create:overstressed.desc" + }, + "icon": { + "item": "minecraft:barrier" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": false, + "hidden": true + }, + "criteria": { + "alloy": { + "trigger": "create:overstressed" + } + }, + "parent": "create:rotation" +} \ No newline at end of file diff --git a/src/main/resources/data/create/advancements/polished_rose_quartz.json b/src/main/resources/data/create/advancements/polished_rose_quartz.json index f50fba33b..1684697b4 100644 --- a/src/main/resources/data/create/advancements/polished_rose_quartz.json +++ b/src/main/resources/data/create/advancements/polished_rose_quartz.json @@ -13,7 +13,7 @@ "frame": "task", "show_toast": true, "announce_to_chat": false, - "hidden": false + "hidden": true }, "criteria": { "quartz": { diff --git a/src/main/resources/data/create/advancements/refined_radiance.json b/src/main/resources/data/create/advancements/refined_radiance.json index 55e0c8d0f..6b3a5adfe 100644 --- a/src/main/resources/data/create/advancements/refined_radiance.json +++ b/src/main/resources/data/create/advancements/refined_radiance.json @@ -12,7 +12,7 @@ }, "frame": "goal", "show_toast": true, - "announce_to_chat": false, + "announce_to_chat": true, "hidden": false }, "criteria": { diff --git a/src/main/resources/data/create/advancements/root.json b/src/main/resources/data/create/advancements/root.json index 9a0590e05..bb037c316 100644 --- a/src/main/resources/data/create/advancements/root.json +++ b/src/main/resources/data/create/advancements/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "create:placement_handgun" + "item": "create:brass_ingot" }, "title": { "translate": "advancement.create:root" @@ -9,7 +9,7 @@ "description": { "translate": "advancement.create:root.desc" }, - "background": "create:textures/block/gabbro_layers.png", + "background": "create:textures/block/scoria_bricks.png", "show_toast": false, "announce_to_chat": false }, diff --git a/src/main/resources/data/create/advancements/rotation.json b/src/main/resources/data/create/advancements/rotation.json new file mode 100644 index 000000000..5f987ec18 --- /dev/null +++ b/src/main/resources/data/create/advancements/rotation.json @@ -0,0 +1,23 @@ +{ + "display": { + "title": { + "translate": "advancement.create:rotation" + }, + "description": { + "translate": "advancement.create:rotation.desc" + }, + "icon": { + "item": "create:cogwheel" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": true + }, + "criteria": { + "alloy": { + "trigger": "create:rotation" + } + }, + "parent": "create:andesite_alloy" +} \ No newline at end of file diff --git a/src/main/resources/data/create/advancements/sand_paper.json b/src/main/resources/data/create/advancements/sand_paper.json index 43a68859c..fd289f9dd 100644 --- a/src/main/resources/data/create/advancements/sand_paper.json +++ b/src/main/resources/data/create/advancements/sand_paper.json @@ -13,7 +13,7 @@ "frame": "task", "show_toast": true, "announce_to_chat": false, - "hidden": false + "hidden": true }, "criteria": { "paperNormal": { @@ -43,5 +43,5 @@ "paperRed" ] ], - "parent": "create:gear" + "parent": "create:root" } \ No newline at end of file diff --git a/src/main/resources/data/create/advancements/sand_paper_secret.json b/src/main/resources/data/create/advancements/sand_paper_secret.json index a1909c12b..79097b1a2 100644 --- a/src/main/resources/data/create/advancements/sand_paper_secret.json +++ b/src/main/resources/data/create/advancements/sand_paper_secret.json @@ -8,7 +8,7 @@ "translate": "advancement.create:sand_paper_secret.desc" }, "icon": { - "item": "create:sand_paper" + "item": "create:red_sand_paper" }, "frame": "goal", "show_toast": true, diff --git a/src/main/resources/data/create/advancements/shadow_steel.json b/src/main/resources/data/create/advancements/shadow_steel.json index d5acbbc23..8c4f7b7a1 100644 --- a/src/main/resources/data/create/advancements/shadow_steel.json +++ b/src/main/resources/data/create/advancements/shadow_steel.json @@ -1,8 +1,7 @@ { "display": { "title": { - "translate": "advancement.create:shadow_steel", - "color": "black" + "translate": "advancement.create:shadow_steel" }, "description": { "translate": "advancement.create:shadow_steel.desc" diff --git a/src/main/resources/data/create/advancements/speed_secret.json b/src/main/resources/data/create/advancements/speed_secret.json index 4003d997f..d867129ad 100644 --- a/src/main/resources/data/create/advancements/speed_secret.json +++ b/src/main/resources/data/create/advancements/speed_secret.json @@ -8,7 +8,7 @@ "translate": "advancement.create:speed_secret.desc" }, "icon": { - "item": "create:rose_quartz" + "item": "create:speed_gauge" }, "frame": "goal", "show_toast": true, diff --git a/src/main/resources/data/create/recipes/crushing/allium.json b/src/main/resources/data/create/recipes/crushing/allium.json index ccf278cf6..ececa0942 100644 --- a/src/main/resources/data/create/recipes/crushing/allium.json +++ b/src/main/resources/data/create/recipes/crushing/allium.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:allium" diff --git a/src/main/resources/data/create/recipes/crushing/andesite.json b/src/main/resources/data/create/recipes/crushing/andesite.json index 6fdbfd728..135c66abb 100644 --- a/src/main/resources/data/create/recipes/crushing/andesite.json +++ b/src/main/resources/data/create/recipes/crushing/andesite.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:andesite" @@ -9,13 +8,7 @@ "results": [ { "item": "minecraft:cobblestone", - "count": 1, - "chance": 0.5 - }, - { - "item": "minecraft:diorite", - "count": 1, - "chance": 0.25 + "count": 1 } ], "processingTime": 200 diff --git a/src/main/resources/data/create/recipes/crushing/azure_bluet.json b/src/main/resources/data/create/recipes/crushing/azure_bluet.json index edb9de874..009dad526 100644 --- a/src/main/resources/data/create/recipes/crushing/azure_bluet.json +++ b/src/main/resources/data/create/recipes/crushing/azure_bluet.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:azure_bluet" diff --git a/src/main/resources/data/create/recipes/crushing/blaze_rod.json b/src/main/resources/data/create/recipes/crushing/blaze_rod.json index f0fc9c6fd..8f282b48e 100644 --- a/src/main/resources/data/create/recipes/crushing/blaze_rod.json +++ b/src/main/resources/data/create/recipes/crushing/blaze_rod.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:blaze_rod" diff --git a/src/main/resources/data/create/recipes/crushing/bone.json b/src/main/resources/data/create/recipes/crushing/bone.json index a9dd339e9..65e3436a7 100644 --- a/src/main/resources/data/create/recipes/crushing/bone.json +++ b/src/main/resources/data/create/recipes/crushing/bone.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:bone" diff --git a/src/main/resources/data/create/recipes/crushing/bone_meal.json b/src/main/resources/data/create/recipes/crushing/bone_meal.json index edd9b528b..806153c6e 100644 --- a/src/main/resources/data/create/recipes/crushing/bone_meal.json +++ b/src/main/resources/data/create/recipes/crushing/bone_meal.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:bone_meal" diff --git a/src/main/resources/data/create/recipes/crushing/cactus.json b/src/main/resources/data/create/recipes/crushing/cactus.json index e72393214..4d5afcfd1 100644 --- a/src/main/resources/data/create/recipes/crushing/cactus.json +++ b/src/main/resources/data/create/recipes/crushing/cactus.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:cactus" diff --git a/src/main/resources/data/create/recipes/crushing/charcoal.json b/src/main/resources/data/create/recipes/crushing/charcoal.json index 3b2c0eff5..a9ccb576e 100644 --- a/src/main/resources/data/create/recipes/crushing/charcoal.json +++ b/src/main/resources/data/create/recipes/crushing/charcoal.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:charcoal" diff --git a/src/main/resources/data/create/recipes/crushing/clay.json b/src/main/resources/data/create/recipes/crushing/clay.json index 96c3fd30f..2d29c8b31 100644 --- a/src/main/resources/data/create/recipes/crushing/clay.json +++ b/src/main/resources/data/create/recipes/crushing/clay.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:clay" diff --git a/src/main/resources/data/create/recipes/crushing/coal.json b/src/main/resources/data/create/recipes/crushing/coal.json index d1381171b..cf5e15cc3 100644 --- a/src/main/resources/data/create/recipes/crushing/coal.json +++ b/src/main/resources/data/create/recipes/crushing/coal.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:coal" diff --git a/src/main/resources/data/create/recipes/crushing/coal_ore.json b/src/main/resources/data/create/recipes/crushing/coal_ore.json index 3dd95ec14..93f8fa076 100644 --- a/src/main/resources/data/create/recipes/crushing/coal_ore.json +++ b/src/main/resources/data/create/recipes/crushing/coal_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:coal_ore" diff --git a/src/main/resources/data/create/recipes/crushing/cobblestone.json b/src/main/resources/data/create/recipes/crushing/cobblestone.json index 4cce6aa7e..028caeb63 100644 --- a/src/main/resources/data/create/recipes/crushing/cobblestone.json +++ b/src/main/resources/data/create/recipes/crushing/cobblestone.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:cobblestone" diff --git a/src/main/resources/data/create/recipes/crushing/cocoa_beans.json b/src/main/resources/data/create/recipes/crushing/cocoa_beans.json index d867d73f9..b602848b9 100644 --- a/src/main/resources/data/create/recipes/crushing/cocoa_beans.json +++ b/src/main/resources/data/create/recipes/crushing/cocoa_beans.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:cocoa_beans" diff --git a/src/main/resources/data/create/recipes/crushing/copper_ore.json b/src/main/resources/data/create/recipes/crushing/copper_ore.json index 5923ca2ed..c5847f54d 100644 --- a/src/main/resources/data/create/recipes/crushing/copper_ore.json +++ b/src/main/resources/data/create/recipes/crushing/copper_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:ores/copper" diff --git a/src/main/resources/data/create/recipes/crushing/cornflower.json b/src/main/resources/data/create/recipes/crushing/cornflower.json index a03194469..1b7d3e3c3 100644 --- a/src/main/resources/data/create/recipes/crushing/cornflower.json +++ b/src/main/resources/data/create/recipes/crushing/cornflower.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:cornflower" diff --git a/src/main/resources/data/create/recipes/crushing/dandelion.json b/src/main/resources/data/create/recipes/crushing/dandelion.json index b892096d9..7596e4d62 100644 --- a/src/main/resources/data/create/recipes/crushing/dandelion.json +++ b/src/main/resources/data/create/recipes/crushing/dandelion.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:dandelion" diff --git a/src/main/resources/data/create/recipes/crushing/diamond_horse_armor.json b/src/main/resources/data/create/recipes/crushing/diamond_horse_armor.json index f43df1edf..0b1d66440 100644 --- a/src/main/resources/data/create/recipes/crushing/diamond_horse_armor.json +++ b/src/main/resources/data/create/recipes/crushing/diamond_horse_armor.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:diamond_horse_armor" diff --git a/src/main/resources/data/create/recipes/crushing/diamond_ore.json b/src/main/resources/data/create/recipes/crushing/diamond_ore.json index a0dc675b9..2565016e4 100644 --- a/src/main/resources/data/create/recipes/crushing/diamond_ore.json +++ b/src/main/resources/data/create/recipes/crushing/diamond_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:diamond_ore" diff --git a/src/main/resources/data/create/recipes/crushing/diorite.json b/src/main/resources/data/create/recipes/crushing/diorite.json index 58abbbc07..58a9a1dbc 100644 --- a/src/main/resources/data/create/recipes/crushing/diorite.json +++ b/src/main/resources/data/create/recipes/crushing/diorite.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:diorite" @@ -8,13 +7,8 @@ ], "results": [ { - "item": "minecraft:cobblestone", + "item": "create:limesand", "count": 1 - }, - { - "item": "minecraft:quartz", - "count": 1, - "chance": 0.125 } ], "processingTime": 200 diff --git a/src/main/resources/data/create/recipes/crushing/emerald_ore.json b/src/main/resources/data/create/recipes/crushing/emerald_ore.json index d1221e6ea..baae81872 100644 --- a/src/main/resources/data/create/recipes/crushing/emerald_ore.json +++ b/src/main/resources/data/create/recipes/crushing/emerald_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:emerald_ore" diff --git a/src/main/resources/data/create/recipes/crushing/fern.json b/src/main/resources/data/create/recipes/crushing/fern.json index 391907357..98d2cf2cf 100644 --- a/src/main/resources/data/create/recipes/crushing/fern.json +++ b/src/main/resources/data/create/recipes/crushing/fern.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:fern" diff --git a/src/main/resources/data/create/recipes/crushing/gold_ore.json b/src/main/resources/data/create/recipes/crushing/gold_ore.json index f4adc881c..9826f8d99 100644 --- a/src/main/resources/data/create/recipes/crushing/gold_ore.json +++ b/src/main/resources/data/create/recipes/crushing/gold_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:ores/gold" diff --git a/src/main/resources/data/create/recipes/crushing/golden_horse_armor.json b/src/main/resources/data/create/recipes/crushing/golden_horse_armor.json index 898a086bb..6ea7d4bcf 100644 --- a/src/main/resources/data/create/recipes/crushing/golden_horse_armor.json +++ b/src/main/resources/data/create/recipes/crushing/golden_horse_armor.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:golden_horse_armor" diff --git a/src/main/resources/data/create/recipes/crushing/granite.json b/src/main/resources/data/create/recipes/crushing/granite.json index 82577d4d0..d82b85c85 100644 --- a/src/main/resources/data/create/recipes/crushing/granite.json +++ b/src/main/resources/data/create/recipes/crushing/granite.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:granite" @@ -8,13 +7,8 @@ ], "results": [ { - "item": "minecraft:diorite", + "item": "minecraft:red_sand", "count": 1 - }, - { - "item": "minecraft:quartz", - "count": 1, - "chance": 0.125 } ], "processingTime": 200 diff --git a/src/main/resources/data/create/recipes/crushing/grass.json b/src/main/resources/data/create/recipes/crushing/grass.json index 04f746d59..0a7aa6764 100644 --- a/src/main/resources/data/create/recipes/crushing/grass.json +++ b/src/main/resources/data/create/recipes/crushing/grass.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:grass" diff --git a/src/main/resources/data/create/recipes/crushing/gravel.json b/src/main/resources/data/create/recipes/crushing/gravel.json index ac476f5cd..7a24b7d2b 100644 --- a/src/main/resources/data/create/recipes/crushing/gravel.json +++ b/src/main/resources/data/create/recipes/crushing/gravel.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:gravel" diff --git a/src/main/resources/data/create/recipes/crushing/ink_sac.json b/src/main/resources/data/create/recipes/crushing/ink_sac.json index 3dff03e6f..82ccec6c9 100644 --- a/src/main/resources/data/create/recipes/crushing/ink_sac.json +++ b/src/main/resources/data/create/recipes/crushing/ink_sac.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:ink_sac" diff --git a/src/main/resources/data/create/recipes/crushing/iron_horse_armor.json b/src/main/resources/data/create/recipes/crushing/iron_horse_armor.json index e430d8f11..88ba0c780 100644 --- a/src/main/resources/data/create/recipes/crushing/iron_horse_armor.json +++ b/src/main/resources/data/create/recipes/crushing/iron_horse_armor.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:iron_horse_armor" diff --git a/src/main/resources/data/create/recipes/crushing/iron_ore.json b/src/main/resources/data/create/recipes/crushing/iron_ore.json index a7b36df00..38e6f01cd 100644 --- a/src/main/resources/data/create/recipes/crushing/iron_ore.json +++ b/src/main/resources/data/create/recipes/crushing/iron_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:ores/iron" diff --git a/src/main/resources/data/create/recipes/crushing/lapis_lazuli.json b/src/main/resources/data/create/recipes/crushing/lapis_lazuli.json index 37b6a60c4..3a7a17eed 100644 --- a/src/main/resources/data/create/recipes/crushing/lapis_lazuli.json +++ b/src/main/resources/data/create/recipes/crushing/lapis_lazuli.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:lapis_lazuli" diff --git a/src/main/resources/data/create/recipes/crushing/lapis_ore.json b/src/main/resources/data/create/recipes/crushing/lapis_ore.json index 0ba5fd117..51873961e 100644 --- a/src/main/resources/data/create/recipes/crushing/lapis_ore.json +++ b/src/main/resources/data/create/recipes/crushing/lapis_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:lapis_ore" diff --git a/src/main/resources/data/create/recipes/crushing/large_fern.json b/src/main/resources/data/create/recipes/crushing/large_fern.json index db05cbcda..08bde6a59 100644 --- a/src/main/resources/data/create/recipes/crushing/large_fern.json +++ b/src/main/resources/data/create/recipes/crushing/large_fern.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:large_fern" diff --git a/src/main/resources/data/create/recipes/crushing/lilac.json b/src/main/resources/data/create/recipes/crushing/lilac.json index 7a5f2cb6e..faf14c4e0 100644 --- a/src/main/resources/data/create/recipes/crushing/lilac.json +++ b/src/main/resources/data/create/recipes/crushing/lilac.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:lilac" diff --git a/src/main/resources/data/create/recipes/crushing/lily_of_the_valley.json b/src/main/resources/data/create/recipes/crushing/lily_of_the_valley.json index e40d3a030..c1db9ef4f 100644 --- a/src/main/resources/data/create/recipes/crushing/lily_of_the_valley.json +++ b/src/main/resources/data/create/recipes/crushing/lily_of_the_valley.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:lily_of_the_valley" diff --git a/src/main/resources/data/create/recipes/crushing/nether_quartz_ore.json b/src/main/resources/data/create/recipes/crushing/nether_quartz_ore.json index 223c1203b..7767fd26c 100644 --- a/src/main/resources/data/create/recipes/crushing/nether_quartz_ore.json +++ b/src/main/resources/data/create/recipes/crushing/nether_quartz_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:nether_quartz_ore" diff --git a/src/main/resources/data/create/recipes/crushing/obsidian.json b/src/main/resources/data/create/recipes/crushing/obsidian.json index d75c3405b..2f747ff5e 100644 --- a/src/main/resources/data/create/recipes/crushing/obsidian.json +++ b/src/main/resources/data/create/recipes/crushing/obsidian.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:obsidian" diff --git a/src/main/resources/data/create/recipes/crushing/orange_tulip.json b/src/main/resources/data/create/recipes/crushing/orange_tulip.json index 07f8b258d..8b49605d2 100644 --- a/src/main/resources/data/create/recipes/crushing/orange_tulip.json +++ b/src/main/resources/data/create/recipes/crushing/orange_tulip.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:orange_tulip" diff --git a/src/main/resources/data/create/recipes/crushing/oxeye_daisy.json b/src/main/resources/data/create/recipes/crushing/oxeye_daisy.json index 0821574d6..92243c26a 100644 --- a/src/main/resources/data/create/recipes/crushing/oxeye_daisy.json +++ b/src/main/resources/data/create/recipes/crushing/oxeye_daisy.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:oxeye_daisy" diff --git a/src/main/resources/data/create/recipes/crushing/peony.json b/src/main/resources/data/create/recipes/crushing/peony.json index 122dbd59e..2f752b5d1 100644 --- a/src/main/resources/data/create/recipes/crushing/peony.json +++ b/src/main/resources/data/create/recipes/crushing/peony.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:peony" diff --git a/src/main/resources/data/create/recipes/crushing/pink_tulip.json b/src/main/resources/data/create/recipes/crushing/pink_tulip.json index 8f47bffb7..ababde21c 100644 --- a/src/main/resources/data/create/recipes/crushing/pink_tulip.json +++ b/src/main/resources/data/create/recipes/crushing/pink_tulip.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:pink_tulip" diff --git a/src/main/resources/data/create/recipes/crushing/poppy.json b/src/main/resources/data/create/recipes/crushing/poppy.json index 1be5e1695..48e38854f 100644 --- a/src/main/resources/data/create/recipes/crushing/poppy.json +++ b/src/main/resources/data/create/recipes/crushing/poppy.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:poppy" diff --git a/src/main/resources/data/create/recipes/crushing/prismarine_crystals.json b/src/main/resources/data/create/recipes/crushing/prismarine_crystals.json index 658b9060d..2c9c5be20 100644 --- a/src/main/resources/data/create/recipes/crushing/prismarine_crystals.json +++ b/src/main/resources/data/create/recipes/crushing/prismarine_crystals.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:prismarine_crystals" diff --git a/src/main/resources/data/create/recipes/crushing/red_tulip.json b/src/main/resources/data/create/recipes/crushing/red_tulip.json index a62910993..76abb9f5b 100644 --- a/src/main/resources/data/create/recipes/crushing/red_tulip.json +++ b/src/main/resources/data/create/recipes/crushing/red_tulip.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:red_tulip" diff --git a/src/main/resources/data/create/recipes/crushing/redstone_ore.json b/src/main/resources/data/create/recipes/crushing/redstone_ore.json index 9860a3353..b2bdf81bb 100644 --- a/src/main/resources/data/create/recipes/crushing/redstone_ore.json +++ b/src/main/resources/data/create/recipes/crushing/redstone_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:redstone_ore" diff --git a/src/main/resources/data/create/recipes/crushing/rose_bush.json b/src/main/resources/data/create/recipes/crushing/rose_bush.json index 1a4fd2e29..7683b6ac1 100644 --- a/src/main/resources/data/create/recipes/crushing/rose_bush.json +++ b/src/main/resources/data/create/recipes/crushing/rose_bush.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:rose_bush" diff --git a/src/main/resources/data/create/recipes/crushing/saddle.json b/src/main/resources/data/create/recipes/crushing/saddle.json index fde4739d9..8b6059bd1 100644 --- a/src/main/resources/data/create/recipes/crushing/saddle.json +++ b/src/main/resources/data/create/recipes/crushing/saddle.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:saddle" diff --git a/src/main/resources/data/create/recipes/crushing/sand.json b/src/main/resources/data/create/recipes/crushing/sand.json index 45773d802..8d02bd559 100644 --- a/src/main/resources/data/create/recipes/crushing/sand.json +++ b/src/main/resources/data/create/recipes/crushing/sand.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:sand" diff --git a/src/main/resources/data/create/recipes/crushing/sugar_cane.json b/src/main/resources/data/create/recipes/crushing/sugar_cane.json index 0b2c42166..219053dfc 100644 --- a/src/main/resources/data/create/recipes/crushing/sugar_cane.json +++ b/src/main/resources/data/create/recipes/crushing/sugar_cane.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:sugar_cane" diff --git a/src/main/resources/data/create/recipes/crushing/sunflower.json b/src/main/resources/data/create/recipes/crushing/sunflower.json index 51ab60675..358680b97 100644 --- a/src/main/resources/data/create/recipes/crushing/sunflower.json +++ b/src/main/resources/data/create/recipes/crushing/sunflower.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:sunflower" diff --git a/src/main/resources/data/create/recipes/crushing/tall_grass.json b/src/main/resources/data/create/recipes/crushing/tall_grass.json index 8e8e975a0..ed595bae2 100644 --- a/src/main/resources/data/create/recipes/crushing/tall_grass.json +++ b/src/main/resources/data/create/recipes/crushing/tall_grass.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:tall_grass" diff --git a/src/main/resources/data/create/recipes/crushing/terracotta.json b/src/main/resources/data/create/recipes/crushing/terracotta.json index 9ed055ae1..85b4fc418 100644 --- a/src/main/resources/data/create/recipes/crushing/terracotta.json +++ b/src/main/resources/data/create/recipes/crushing/terracotta.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:terracotta" diff --git a/src/main/resources/data/create/recipes/crushing/wheat.json b/src/main/resources/data/create/recipes/crushing/wheat.json index 810141b3c..2fddb1788 100644 --- a/src/main/resources/data/create/recipes/crushing/wheat.json +++ b/src/main/resources/data/create/recipes/crushing/wheat.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:wheat" diff --git a/src/main/resources/data/create/recipes/crushing/white_tulip.json b/src/main/resources/data/create/recipes/crushing/white_tulip.json index 404e86b55..f64847a9e 100644 --- a/src/main/resources/data/create/recipes/crushing/white_tulip.json +++ b/src/main/resources/data/create/recipes/crushing/white_tulip.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:white_tulip" diff --git a/src/main/resources/data/create/recipes/crushing/wither_rose.json b/src/main/resources/data/create/recipes/crushing/wither_rose.json index dc30beb94..543c1baa1 100644 --- a/src/main/resources/data/create/recipes/crushing/wither_rose.json +++ b/src/main/resources/data/create/recipes/crushing/wither_rose.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:wither_rose" diff --git a/src/main/resources/data/create/recipes/crushing/wool.json b/src/main/resources/data/create/recipes/crushing/wool.json index a9d689563..21f9ba59c 100644 --- a/src/main/resources/data/create/recipes/crushing/wool.json +++ b/src/main/resources/data/create/recipes/crushing/wool.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "tag": "minecraft:wool" diff --git a/src/main/resources/data/create/recipes/crushing/zinc_ore.json b/src/main/resources/data/create/recipes/crushing/zinc_ore.json index 50e57d798..6595a358a 100644 --- a/src/main/resources/data/create/recipes/crushing/zinc_ore.json +++ b/src/main/resources/data/create/recipes/crushing/zinc_ore.json @@ -1,6 +1,5 @@ { "type": "create:crushing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:ores/zinc" diff --git a/src/main/resources/data/create/recipes/cutting/acacia_log.json b/src/main/resources/data/create/recipes/cutting/acacia_log.json index bc012e2a2..9a449a5e8 100644 --- a/src/main/resources/data/create/recipes/cutting/acacia_log.json +++ b/src/main/resources/data/create/recipes/cutting/acacia_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:acacia_log" diff --git a/src/main/resources/data/create/recipes/cutting/andesite_alloy.json b/src/main/resources/data/create/recipes/cutting/andesite_alloy.json index e59d40cd7..300efc416 100644 --- a/src/main/resources/data/create/recipes/cutting/andesite_alloy.json +++ b/src/main/resources/data/create/recipes/cutting/andesite_alloy.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "create:andesite_alloy" diff --git a/src/main/resources/data/create/recipes/cutting/birch_log.json b/src/main/resources/data/create/recipes/cutting/birch_log.json index f66633e5a..ec235d23f 100644 --- a/src/main/resources/data/create/recipes/cutting/birch_log.json +++ b/src/main/resources/data/create/recipes/cutting/birch_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:birch_log" diff --git a/src/main/resources/data/create/recipes/cutting/dark_oak_log.json b/src/main/resources/data/create/recipes/cutting/dark_oak_log.json index b19e7ec6d..ba92f8d75 100644 --- a/src/main/resources/data/create/recipes/cutting/dark_oak_log.json +++ b/src/main/resources/data/create/recipes/cutting/dark_oak_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:dark_oak_log" diff --git a/src/main/resources/data/create/recipes/cutting/jungle_log.json b/src/main/resources/data/create/recipes/cutting/jungle_log.json index 0a87ccf16..29baf9668 100644 --- a/src/main/resources/data/create/recipes/cutting/jungle_log.json +++ b/src/main/resources/data/create/recipes/cutting/jungle_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:jungle_log" diff --git a/src/main/resources/data/create/recipes/cutting/oak_log.json b/src/main/resources/data/create/recipes/cutting/oak_log.json index e0a934b4c..2d8fe8c98 100644 --- a/src/main/resources/data/create/recipes/cutting/oak_log.json +++ b/src/main/resources/data/create/recipes/cutting/oak_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:oak_log" diff --git a/src/main/resources/data/create/recipes/cutting/spruce_log.json b/src/main/resources/data/create/recipes/cutting/spruce_log.json index 6404bbc7d..60d39ae39 100644 --- a/src/main/resources/data/create/recipes/cutting/spruce_log.json +++ b/src/main/resources/data/create/recipes/cutting/spruce_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:spruce_log" diff --git a/src/main/resources/data/create/recipes/cutting/stripped_acacia_log.json b/src/main/resources/data/create/recipes/cutting/stripped_acacia_log.json index 5caccc871..6bd4dbaf4 100644 --- a/src/main/resources/data/create/recipes/cutting/stripped_acacia_log.json +++ b/src/main/resources/data/create/recipes/cutting/stripped_acacia_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:stripped_acacia_log" diff --git a/src/main/resources/data/create/recipes/cutting/stripped_birch_log.json b/src/main/resources/data/create/recipes/cutting/stripped_birch_log.json index 85b057727..e39f0863d 100644 --- a/src/main/resources/data/create/recipes/cutting/stripped_birch_log.json +++ b/src/main/resources/data/create/recipes/cutting/stripped_birch_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:stripped_birch_log" diff --git a/src/main/resources/data/create/recipes/cutting/stripped_dark_oak_log.json b/src/main/resources/data/create/recipes/cutting/stripped_dark_oak_log.json index ce2415689..eba570fae 100644 --- a/src/main/resources/data/create/recipes/cutting/stripped_dark_oak_log.json +++ b/src/main/resources/data/create/recipes/cutting/stripped_dark_oak_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:stripped_dark_oak_log" diff --git a/src/main/resources/data/create/recipes/cutting/stripped_jungle_log.json b/src/main/resources/data/create/recipes/cutting/stripped_jungle_log.json index 095178c94..41fd26a47 100644 --- a/src/main/resources/data/create/recipes/cutting/stripped_jungle_log.json +++ b/src/main/resources/data/create/recipes/cutting/stripped_jungle_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:stripped_jungle_log" diff --git a/src/main/resources/data/create/recipes/cutting/stripped_oak_log.json b/src/main/resources/data/create/recipes/cutting/stripped_oak_log.json index a41c57df1..54540d4c9 100644 --- a/src/main/resources/data/create/recipes/cutting/stripped_oak_log.json +++ b/src/main/resources/data/create/recipes/cutting/stripped_oak_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:stripped_oak_log" diff --git a/src/main/resources/data/create/recipes/cutting/stripped_spruce_log.json b/src/main/resources/data/create/recipes/cutting/stripped_spruce_log.json index bcea76727..5bd6493c2 100644 --- a/src/main/resources/data/create/recipes/cutting/stripped_spruce_log.json +++ b/src/main/resources/data/create/recipes/cutting/stripped_spruce_log.json @@ -1,6 +1,5 @@ { "type": "create:cutting", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:stripped_spruce_log" diff --git a/src/main/resources/data/create/recipes/mixing/andesite_alloy.json b/src/main/resources/data/create/recipes/mixing/andesite_alloy.json index e09e8f5b9..3378d4cb0 100644 --- a/src/main/resources/data/create/recipes/mixing/andesite_alloy.json +++ b/src/main/resources/data/create/recipes/mixing/andesite_alloy.json @@ -1,6 +1,5 @@ { "type": "create:mixing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:andesite" diff --git a/src/main/resources/data/create/recipes/mixing/andesite_alloy_1.json b/src/main/resources/data/create/recipes/mixing/andesite_alloy_1.json index 05d00ebb4..80f7e589b 100644 --- a/src/main/resources/data/create/recipes/mixing/andesite_alloy_1.json +++ b/src/main/resources/data/create/recipes/mixing/andesite_alloy_1.json @@ -1,6 +1,5 @@ { "type": "create:mixing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:andesite" diff --git a/src/main/resources/data/create/recipes/mixing/brass_nugget.json b/src/main/resources/data/create/recipes/mixing/brass_nugget.json index ca90d73a6..60210f795 100644 --- a/src/main/resources/data/create/recipes/mixing/brass_nugget.json +++ b/src/main/resources/data/create/recipes/mixing/brass_nugget.json @@ -1,6 +1,5 @@ { "type": "create:mixing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:nuggets/copper" diff --git a/src/main/resources/data/create/recipes/mixing/chromatic_compound.json b/src/main/resources/data/create/recipes/mixing/chromatic_compound.json index 95c8f6af1..92f30a818 100644 --- a/src/main/resources/data/create/recipes/mixing/chromatic_compound.json +++ b/src/main/resources/data/create/recipes/mixing/chromatic_compound.json @@ -1,6 +1,5 @@ { "type": "create:mixing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:dusts/glowstone" diff --git a/src/main/resources/data/create/recipes/pressing/brass_ingot.json b/src/main/resources/data/create/recipes/pressing/brass_ingot.json index 7ca38827d..9e50f6613 100644 --- a/src/main/resources/data/create/recipes/pressing/brass_ingot.json +++ b/src/main/resources/data/create/recipes/pressing/brass_ingot.json @@ -1,6 +1,5 @@ { "type": "create:pressing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:ingots/brass" @@ -11,6 +10,5 @@ "item": "create:brass_sheet", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/pressing/copper_ingot.json b/src/main/resources/data/create/recipes/pressing/copper_ingot.json index 44c1c7cb0..b0dc3987e 100644 --- a/src/main/resources/data/create/recipes/pressing/copper_ingot.json +++ b/src/main/resources/data/create/recipes/pressing/copper_ingot.json @@ -1,6 +1,5 @@ { "type": "create:pressing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:ingots/copper" @@ -11,6 +10,5 @@ "item": "create:copper_sheet", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/pressing/gold_ingot.json b/src/main/resources/data/create/recipes/pressing/gold_ingot.json index 6e9a29362..877d68bca 100644 --- a/src/main/resources/data/create/recipes/pressing/gold_ingot.json +++ b/src/main/resources/data/create/recipes/pressing/gold_ingot.json @@ -1,6 +1,5 @@ { "type": "create:pressing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:ingots/gold" @@ -11,6 +10,5 @@ "item": "create:gold_sheet", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/pressing/iron_ingot.json b/src/main/resources/data/create/recipes/pressing/iron_ingot.json index e54bd8eb6..d16c3c254 100644 --- a/src/main/resources/data/create/recipes/pressing/iron_ingot.json +++ b/src/main/resources/data/create/recipes/pressing/iron_ingot.json @@ -1,6 +1,5 @@ { "type": "create:pressing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:ingots/iron" @@ -11,6 +10,5 @@ "item": "create:iron_sheet", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/pressing/lapis_block.json b/src/main/resources/data/create/recipes/pressing/lapis_block.json index 62239dff0..f023361c7 100644 --- a/src/main/resources/data/create/recipes/pressing/lapis_block.json +++ b/src/main/resources/data/create/recipes/pressing/lapis_block.json @@ -1,6 +1,5 @@ { "type": "create:pressing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:lapis_block" diff --git a/src/main/resources/data/create/recipes/pressing/sugar_cane.json b/src/main/resources/data/create/recipes/pressing/sugar_cane.json index c7e417eba..c9dc82f8a 100644 --- a/src/main/resources/data/create/recipes/pressing/sugar_cane.json +++ b/src/main/resources/data/create/recipes/pressing/sugar_cane.json @@ -1,6 +1,5 @@ { "type": "create:pressing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:sugar_cane" @@ -11,6 +10,5 @@ "item": "minecraft:paper", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/sandpaper_polishing/rose_quartz.json b/src/main/resources/data/create/recipes/sandpaper_polishing/rose_quartz.json index f04adb45f..344b731aa 100644 --- a/src/main/resources/data/create/recipes/sandpaper_polishing/rose_quartz.json +++ b/src/main/resources/data/create/recipes/sandpaper_polishing/rose_quartz.json @@ -1,6 +1,5 @@ { "type": "create:sandpaper_polishing", - "group": "minecraft:misc", "ingredients": [ { "item": "create:rose_quartz" diff --git a/src/main/resources/data/create/recipes/splashing/black_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/black_concrete_powder.json index b3a981760..547a13409 100644 --- a/src/main/resources/data/create/recipes/splashing/black_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/black_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:black_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:black_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/blue_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/blue_concrete_powder.json index 938adbf78..e08f79443 100644 --- a/src/main/resources/data/create/recipes/splashing/blue_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/blue_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:blue_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:blue_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/brown_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/brown_concrete_powder.json index 7744a6c5f..9f2cc1240 100644 --- a/src/main/resources/data/create/recipes/splashing/brown_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/brown_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:brown_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:brown_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/bucket.json b/src/main/resources/data/create/recipes/splashing/bucket.json index 4d7ab6762..f9a9ef937 100644 --- a/src/main/resources/data/create/recipes/splashing/bucket.json +++ b/src/main/resources/data/create/recipes/splashing/bucket.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:bucket" @@ -11,6 +10,5 @@ "item": "minecraft:water_bucket", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/crushed_brass.json b/src/main/resources/data/create/recipes/splashing/crushed_brass.json index 7a69fa1a4..7fee39a22 100644 --- a/src/main/resources/data/create/recipes/splashing/crushed_brass.json +++ b/src/main/resources/data/create/recipes/splashing/crushed_brass.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "create:crushed_brass" @@ -17,6 +16,5 @@ "count": 5, "chance": 0.5 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/crushed_copper.json b/src/main/resources/data/create/recipes/splashing/crushed_copper.json index 024f9cac9..251110d4e 100644 --- a/src/main/resources/data/create/recipes/splashing/crushed_copper.json +++ b/src/main/resources/data/create/recipes/splashing/crushed_copper.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "create:crushed_copper" @@ -17,6 +16,5 @@ "count": 5, "chance": 0.5 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/crushed_gold.json b/src/main/resources/data/create/recipes/splashing/crushed_gold.json index 3e354b9f5..a71458cf2 100644 --- a/src/main/resources/data/create/recipes/splashing/crushed_gold.json +++ b/src/main/resources/data/create/recipes/splashing/crushed_gold.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "create:crushed_gold" @@ -17,6 +16,5 @@ "count": 5, "chance": 0.5 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/crushed_iron.json b/src/main/resources/data/create/recipes/splashing/crushed_iron.json index 86d4b64ae..d5a16eb29 100644 --- a/src/main/resources/data/create/recipes/splashing/crushed_iron.json +++ b/src/main/resources/data/create/recipes/splashing/crushed_iron.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "create:crushed_iron" @@ -17,6 +16,5 @@ "count": 5, "chance": 0.5 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/crushed_zinc.json b/src/main/resources/data/create/recipes/splashing/crushed_zinc.json index a8a8800be..f7753186a 100644 --- a/src/main/resources/data/create/recipes/splashing/crushed_zinc.json +++ b/src/main/resources/data/create/recipes/splashing/crushed_zinc.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "create:crushed_zinc" @@ -17,6 +16,5 @@ "count": 5, "chance": 0.5 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/cyan_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/cyan_concrete_powder.json index 378abf3e6..40b028b17 100644 --- a/src/main/resources/data/create/recipes/splashing/cyan_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/cyan_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:cyan_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:cyan_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/flour.json b/src/main/resources/data/create/recipes/splashing/flour.json index f9dc10a4d..8f93a7d4c 100644 --- a/src/main/resources/data/create/recipes/splashing/flour.json +++ b/src/main/resources/data/create/recipes/splashing/flour.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "create:flour" @@ -11,6 +10,5 @@ "item": "create:dough", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/gravel.json b/src/main/resources/data/create/recipes/splashing/gravel.json index 19cd6dfa1..e98763af1 100644 --- a/src/main/resources/data/create/recipes/splashing/gravel.json +++ b/src/main/resources/data/create/recipes/splashing/gravel.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:gravel" @@ -17,6 +16,5 @@ "count": 1, "chance": 0.125 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/gray_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/gray_concrete_powder.json index 3c1cf2d33..88fba5b2a 100644 --- a/src/main/resources/data/create/recipes/splashing/gray_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/gray_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:gray_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:gray_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/green_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/green_concrete_powder.json index 8a0b27250..04e2cedb4 100644 --- a/src/main/resources/data/create/recipes/splashing/green_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/green_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:green_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:green_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/ice.json b/src/main/resources/data/create/recipes/splashing/ice.json index 4853ff6db..562e5fc77 100644 --- a/src/main/resources/data/create/recipes/splashing/ice.json +++ b/src/main/resources/data/create/recipes/splashing/ice.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:ice" @@ -11,6 +10,5 @@ "item": "minecraft:packed_ice", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/light_blue_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/light_blue_concrete_powder.json index 2c5824b3f..f87e3ec71 100644 --- a/src/main/resources/data/create/recipes/splashing/light_blue_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/light_blue_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:light_blue_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:light_blue_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/light_gray_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/light_gray_concrete_powder.json index e07a3eacc..561c42a6f 100644 --- a/src/main/resources/data/create/recipes/splashing/light_gray_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/light_gray_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:light_gray_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:light_gray_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/lime_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/lime_concrete_powder.json index 624331071..a7f3cb041 100644 --- a/src/main/resources/data/create/recipes/splashing/lime_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/lime_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:lime_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:lime_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/magenta_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/magenta_concrete_powder.json index d29a09e1b..25ca2eb01 100644 --- a/src/main/resources/data/create/recipes/splashing/magenta_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/magenta_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:magenta_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:magenta_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/magma_block.json b/src/main/resources/data/create/recipes/splashing/magma_block.json index 0e31c55b5..a03a71865 100644 --- a/src/main/resources/data/create/recipes/splashing/magma_block.json +++ b/src/main/resources/data/create/recipes/splashing/magma_block.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:magma_block" @@ -11,6 +10,5 @@ "item": "minecraft:obsidian", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/orange_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/orange_concrete_powder.json index e9f3a547f..c7645f475 100644 --- a/src/main/resources/data/create/recipes/splashing/orange_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/orange_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:orange_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:orange_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/pink_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/pink_concrete_powder.json index c1417d231..e38aedcc4 100644 --- a/src/main/resources/data/create/recipes/splashing/pink_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/pink_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:pink_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:pink_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/purple_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/purple_concrete_powder.json index 44e0f979f..93b9acfcd 100644 --- a/src/main/resources/data/create/recipes/splashing/purple_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/purple_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:purple_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:purple_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/red_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/red_concrete_powder.json index 73997e311..81db74b48 100644 --- a/src/main/resources/data/create/recipes/splashing/red_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/red_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:red_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:red_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/red_sand.json b/src/main/resources/data/create/recipes/splashing/red_sand.json index 6b66c4b36..b1b51d8d9 100644 --- a/src/main/resources/data/create/recipes/splashing/red_sand.json +++ b/src/main/resources/data/create/recipes/splashing/red_sand.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:red_sand" diff --git a/src/main/resources/data/create/recipes/splashing/sand.json b/src/main/resources/data/create/recipes/splashing/sand.json index 02d552ded..6be1af521 100644 --- a/src/main/resources/data/create/recipes/splashing/sand.json +++ b/src/main/resources/data/create/recipes/splashing/sand.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:sand" @@ -12,6 +11,5 @@ "count": 1, "chance": 0.25 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/soul_sand.json b/src/main/resources/data/create/recipes/splashing/soul_sand.json index a0f4a56a9..020073dc2 100644 --- a/src/main/resources/data/create/recipes/splashing/soul_sand.json +++ b/src/main/resources/data/create/recipes/splashing/soul_sand.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:soul_sand" @@ -17,6 +16,5 @@ "count": 1, "chance": 0.02 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/stained_glass.json b/src/main/resources/data/create/recipes/splashing/stained_glass.json index 67417dff9..54151c62c 100644 --- a/src/main/resources/data/create/recipes/splashing/stained_glass.json +++ b/src/main/resources/data/create/recipes/splashing/stained_glass.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:stained_glass" @@ -11,6 +10,5 @@ "item": "minecraft:glass", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/stained_glass_pane.json b/src/main/resources/data/create/recipes/splashing/stained_glass_pane.json index c0bdaec76..056c4a752 100644 --- a/src/main/resources/data/create/recipes/splashing/stained_glass_pane.json +++ b/src/main/resources/data/create/recipes/splashing/stained_glass_pane.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "tag": "forge:stained_glass_panes" @@ -11,6 +10,5 @@ "item": "minecraft:glass_pane", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/white_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/white_concrete_powder.json index b7ab761e7..c10a89d80 100644 --- a/src/main/resources/data/create/recipes/splashing/white_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/white_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:white_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:white_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/wool.json b/src/main/resources/data/create/recipes/splashing/wool.json index 02782d372..664136bfc 100644 --- a/src/main/resources/data/create/recipes/splashing/wool.json +++ b/src/main/resources/data/create/recipes/splashing/wool.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "tag": "minecraft:wool" @@ -11,6 +10,5 @@ "item": "minecraft:white_wool", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/splashing/yellow_concrete_powder.json b/src/main/resources/data/create/recipes/splashing/yellow_concrete_powder.json index b9c5d14de..c68141de8 100644 --- a/src/main/resources/data/create/recipes/splashing/yellow_concrete_powder.json +++ b/src/main/resources/data/create/recipes/splashing/yellow_concrete_powder.json @@ -1,6 +1,5 @@ { "type": "create:splashing", - "group": "minecraft:misc", "ingredients": [ { "item": "minecraft:yellow_concrete_powder" @@ -11,6 +10,5 @@ "item": "minecraft:yellow_concrete", "count": 1 } - ], - "processingTime": 100 + ] } \ No newline at end of file