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
This commit is contained in:
simibubi 2020-03-06 01:09:10 +01:00
parent c3278c91c8
commit fed4df515a
137 changed files with 275 additions and 377 deletions

View file

@ -1,6 +1,6 @@
package com.simibubi.create; package com.simibubi.create;
import com.simibubi.create.foundation.advancement.AllCriterionTriggers; import com.simibubi.create.foundation.advancement.AllTriggers;
import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvent;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -72,7 +72,7 @@ public class Create {
CraftingHelper.register(new ModuleLoadedCondition.Serializer()); CraftingHelper.register(new ModuleLoadedCondition.Serializer());
AllPackets.registerPackets(); AllPackets.registerPackets();
AllCriterionTriggers.register(); AllTriggers.register();
} }
public static void serverStarting(FMLServerStartingEvent event) { public static void serverStarting(FMLServerStartingEvent event) {

View file

@ -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<CriterionTriggerBase<?>> 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 extends CriterionTriggerBase<?>> T add(T instance) {
triggers.add(instance);
return instance;
}
public static void register(){
triggers.forEach(CriteriaTriggers::register);
}
}

View file

@ -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<CriterionTriggerBase<?>> 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 extends CriterionTriggerBase<?>> 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<PlayerEntity> playerFilter) {
if (world == null)
return;
if (world.isRemote)
return;
List<ServerPlayerEntity> players =
world.getEntitiesWithinAABB(ServerPlayerEntity.class, new AxisAlignedBB(pos).grow(range));
players.stream().filter(playerFilter).forEach(trigger::trigger);
}
}

View file

@ -24,22 +24,6 @@ public class SandpaperUseTrigger extends CriterionTriggerBase<SandpaperUseTrigge
public void trigger(ServerPlayerEntity player, ItemStack target, ItemStack result){ public void trigger(ServerPlayerEntity player, ItemStack target, ItemStack result){
trigger(player, Arrays.asList(() -> target, () -> result)); trigger(player, Arrays.asList(() -> target, () -> result));
/*PlayerAdvancements playerAdvancements = player.getAdvancements();
Set<Listener<Instance>> playerListeners = this.listeners.get(playerAdvancements);
if (playerListeners != null){
List<Listener<Instance>> list = new LinkedList<>();
for (Listener<Instance> listener :
playerListeners) {
if (listener.getCriterionInstance().test(target, result)) {
list.add(listener);
}
}
list.forEach(listener -> listener.grantCriterion(playerAdvancements));
}*/
} }
public static class Instance extends CriterionTriggerBase.Instance { public static class Instance extends CriterionTriggerBase.Instance {

View file

@ -8,9 +8,9 @@ import net.minecraft.util.ResourceLocation;
import java.util.List; import java.util.List;
import java.util.function.Supplier; import java.util.function.Supplier;
public class NoArgumentTrigger extends CriterionTriggerBase<NoArgumentTrigger.Instance> { public class SimpleTrigger extends CriterionTriggerBase<SimpleTrigger.Instance> {
public NoArgumentTrigger(String id) { public SimpleTrigger(String id) {
super(id); super(id);
} }

View file

@ -11,6 +11,7 @@ import java.util.UUID;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.simibubi.create.config.AllConfigs; 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.SmartTileEntity;
import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour;
import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.VecHelper;
@ -74,6 +75,8 @@ public abstract class KineticTileEntity extends SmartTileEntity implements ITick
this.currentStress = currentStress; this.currentStress = currentStress;
boolean overStressed = maxStress < currentStress && StressImpact.isEnabled(); boolean overStressed = maxStress < currentStress && StressImpact.isEnabled();
if (overStressed != this.overStressed) { if (overStressed != this.overStressed) {
if (speed != 0 && overStressed)
AllTriggers.triggerForNearbyPlayers(AllTriggers.OVERSTRESSED, world, pos, 8);
float prevSpeed = getSpeed(); float prevSpeed = getSpeed();
this.overStressed = overStressed; this.overStressed = overStressed;
onSpeedChanged(prevSpeed); onSpeedChanged(prevSpeed);
@ -403,6 +406,7 @@ public abstract class KineticTileEntity extends SmartTileEntity implements ITick
particleSpeed *= Math.signum(getSpeed()); particleSpeed *= Math.signum(getSpeed());
if (getWorld() instanceof ServerWorld) { if (getWorld() instanceof ServerWorld) {
AllTriggers.triggerForNearbyPlayers(AllTriggers.ROTATION, world, pos, 5);
RotationIndicatorParticleData particleData = RotationIndicatorParticleData particleData =
new RotationIndicatorParticleData(color, particleSpeed, radius1, radius2, 10, axisChar); new RotationIndicatorParticleData(color, particleSpeed, radius1, radius2, 10, axisChar);
((ServerWorld) getWorld()).spawnParticle(particleData, vec.x, vec.y, vec.z, 20, 0, 0, 0, 1); ((ServerWorld) getWorld()).spawnParticle(particleData, vec.x, vec.y, vec.z, 20, 0, 0, 0, 1);

View file

@ -109,7 +109,8 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
if (speed != 0) { if (speed != 0) {
int dayTime = (int) (world.getDayTime() % 24000); int dayTime = (int) (world.getDayTime() % 24000);
int hours = (dayTime / 1000 + 6) % 24; 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)); speed = Math.max(speed, AngleHelper.getShortestAngleDiff(hourAngle, hourTarget));
} }
@ -122,7 +123,8 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
if (speed != 0) { if (speed != 0) {
int dayTime = (int) (world.getDayTime() % 24000); int dayTime = (int) (world.getDayTime() % 24000);
int minutes = (dayTime % 1000) * 60 / 1000; 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)); speed = Math.max(speed, AngleHelper.getShortestAngleDiff(minuteAngle, hourTarget));
} }

View file

@ -13,7 +13,7 @@ import org.apache.commons.lang3.tuple.Pair;
import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllTileEntities; 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.base.TileEntityBehaviour;
import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour;
import com.simibubi.create.foundation.behaviour.inventory.ExtractingBehaviour; import com.simibubi.create.foundation.behaviour.inventory.ExtractingBehaviour;
@ -247,7 +247,7 @@ public class DeployerTileEntity extends KineticTileEntity {
// award nearby players // award nearby players
List<ServerPlayerEntity> players = List<ServerPlayerEntity> players =
world.getEntitiesWithinAABB(ServerPlayerEntity.class, new AxisAlignedBB(pos).grow(9)); world.getEntitiesWithinAABB(ServerPlayerEntity.class, new AxisAlignedBB(pos).grow(9));
players.forEach(AllCriterionTriggers.DEPLOYER_BOOP::trigger); players.forEach(AllTriggers.DEPLOYER_BOOP::trigger);
} }
protected void activate() { protected void activate() {

View file

@ -2,17 +2,13 @@ package com.simibubi.create.modules.contraptions.relays.gauge;
import com.simibubi.create.AllTileEntities; import com.simibubi.create.AllTileEntities;
import com.simibubi.create.config.AllConfigs; 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.foundation.utility.ColorHelper;
import com.simibubi.create.modules.contraptions.GogglesItem; import com.simibubi.create.modules.contraptions.GogglesItem;
import com.simibubi.create.modules.contraptions.base.IRotate.SpeedLevel; 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 net.minecraft.util.math.MathHelper;
import java.util.List;
public class SpeedGaugeTileEntity extends GaugeTileEntity { public class SpeedGaugeTileEntity extends GaugeTileEntity {
public SpeedGaugeTileEntity() { public SpeedGaugeTileEntity() {
@ -28,12 +24,9 @@ public class SpeedGaugeTileEntity extends GaugeTileEntity {
float max = AllConfigs.SERVER.kinetics.maxRotationSpeed.get().floatValue(); float max = AllConfigs.SERVER.kinetics.maxRotationSpeed.get().floatValue();
color = ColorHelper.mixColors(SpeedLevel.of(speed).getColor(), 0xffffff, .25f); color = ColorHelper.mixColors(SpeedLevel.of(speed).getColor(), 0xffffff, .25f);
if (speed == 666){ if (speed == 69)
assert world != null; AllTriggers.triggerForNearbyPlayers(AllTriggers.SPEED_READ, world, pos, 6,
List<ServerPlayerEntity> players = world.getEntitiesWithinAABB(ServerPlayerEntity.class, new AxisAlignedBB(pos).grow(6)); GogglesItem::canSeeParticles);
players.stream().filter(GogglesItem::canSeeParticles).forEach(AllCriterionTriggers.SPEED_READ::trigger);
}
if (speed == 0) { if (speed == 0) {
dialTarget = 0; dialTarget = 0;
color = 0x333333; color = 0x333333;

View file

@ -6,7 +6,7 @@ import java.util.Random;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.config.AllConfigs; import com.simibubi.create.config.AllConfigs;
import com.simibubi.create.config.CCuriosities; 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.item.IItemWithColorHandler;
import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.AnimationTickHolder;
import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.ColorHelper;
@ -159,7 +159,7 @@ public class ChromaticCompoundCubeItem extends Item implements IItemWithColorHan
entity.setItem(newStack); entity.setItem(newStack);
List<ServerPlayerEntity> players = world.getEntitiesWithinAABB(ServerPlayerEntity.class, new AxisAlignedBB(entity.getPosition()).grow(8)); List<ServerPlayerEntity> 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; return false;
} }

View file

@ -1,6 +1,6 @@
package com.simibubi.create.modules.curiosities.tools; 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.block.render.CustomRenderedItemModel;
import com.simibubi.create.foundation.item.IHaveCustomItemModel; import com.simibubi.create.foundation.item.IHaveCustomItemModel;
import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.VecHelper;
@ -135,7 +135,7 @@ public class SandPaperItem extends Item implements IHaveCustomItemModel {
if (player instanceof DeployerFakePlayer) { if (player instanceof DeployerFakePlayer) {
player.dropItem(polished, false, false); player.dropItem(polished, false, false);
} else { } else {
AllCriterionTriggers.SANDPAPER_USE.trigger((ServerPlayerEntity) player, toPolish, polished); AllTriggers.SANDPAPER_USE.trigger((ServerPlayerEntity) player, toPolish, polished);
player.inventory.placeItemBackInInventory(worldIn, polished); player.inventory.placeItemBackInInventory(worldIn, polished);
} }

View file

@ -604,50 +604,52 @@
"create.command.killTPSCommand": "killtps", "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.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.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.0": "[Create]: use /killtps stop to bring back server tick to regular speed",
"create.command.killTPSCommand.status.usage.1": "[Create]: use /killtps start <tickTime> to artificially slow down the server tick", "create.command.killTPSCommand.status.usage.1": "[Create]: use /killtps start <tickTime> to artificially slow down the server tick",
"create.command.killTPSCommand.argument.tickTime": "tickTime", "create.command.killTPSCommand.argument.tickTime": "tickTime",
"advancement.create:root": "Create Advancements", "advancement.create:root": "The beginning of Create",
"advancement.create:root.desc": "~ Root Description", "advancement.create:root.desc": "It's time to start building some amazing Contraptions!",
"advancement.create:andesite_alloy": "Andesite Alloy", "advancement.create:andesite_alloy": "Alliterations Aplenty",
"advancement.create:andesite_alloy.desc": "A basic building block of Create", "advancement.create:andesite_alloy.desc": "Create's materials have weird names, Andesite Alloy is one of them.",
"advancement.create:andesite_casing": "Andesite Casing", "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: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": "A Pair of Giants",
"advancement.create:crushing_wheel.desc": "Create a pair of Crushing Wheels", "advancement.create:crushing_wheel.desc": "Create some Crushing Wheels for breaking down materials.",
"advancement.create:gear": "Know what really grinds my Gears?", "advancement.create:rotation": "It's Alive",
"advancement.create:gear.desc": "~ Oh you don't care? Fine then..", "advancement.create:rotation.desc": "Watch your first kinetic component spin.",
"advancement.create:sand_paper": "Sand Paper", "advancement.create:overstressed": "Overstressed",
"advancement.create:sand_paper.desc": "~ Description", "advancement.create:overstressed.desc": "Experience the laws of physics firsthand.",
"advancement.create:polished_rose_quartz": "Polished Rose Quartz", "advancement.create:sand_paper": "Power Polish",
"advancement.create:polished_rose_quartz.desc": "~ Description", "advancement.create:sand_paper.desc": "Create some Sand Paper",
"advancement.create:sand_paper_secret": "Sandier 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: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: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": "Mixin' it up",
"advancement.create:mixer.desc": "Make a Mechanical Mixer", "advancement.create:mixer.desc": "Create a Mechanical Mixer",
"advancement.create:brass": "Brass", "advancement.create:brass": "An actual Alloy",
"advancement.create:brass.desc": "~ Description", "advancement.create:brass.desc": "Use Copper and Zinc to create some Brass",
"advancement.create:brass_casing": "Brass Casing", "advancement.create:brass_casing": "The Brass Age",
"advancement.create:brass_casing.desc": "~ Description", "advancement.create:brass_casing.desc": "Use your newly obtained Brass and some Wood to create a more advanced Casing",
"advancement.create:deployer": "Deployer", "advancement.create:deployer": "Poke, Place and Attack",
"advancement.create:deployer.desc": "~ Description", "advancement.create:deployer.desc": "Create a Deployer, the perfect reflection of yourself.",
"advancement.create:deployer_secret": "Pound it, brother", "advancement.create:deployer_secret": "Pound it, brother",
"advancement.create:deployer_secret.desc": "~ Description", "advancement.create:deployer_secret.desc": "Make two Deployers bump their fists.",
"advancement.create:chromatic_compound": "Chromatic Compound", "advancement.create:chromatic_compound": "Bipolar Materials",
"advancement.create:chromatic_compound.desc": "~ Description", "advancement.create:chromatic_compound.desc": "Craft a Bar of Chromatic Compound.",
"advancement.create:shadow_steel": "Not quite as Shiny", "advancement.create:shadow_steel": "Returned from the Void",
"advancement.create:shadow_steel.desc": "~ Description", "advancement.create:shadow_steel.desc": "Create Shadow Steel, a metal bar of emptiness.",
"advancement.create:refined_radiance": "SHINY!!", "advancement.create:refined_radiance": "Bright and Inspiring",
"advancement.create:refined_radiance.desc": "~ Description", "advancement.create:refined_radiance.desc": "Create Refined Radiance, a powerful chromatic substance.",
"advancement.create:refined_radiance_secret": "~ Name", "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:refined_radiance_secret.desc": "Find the alternative way to make Refined Radiance",
"advancement.create:speed_secret": "Hella fast", "advancement.create:speed_secret": "Nice ",
"advancement.create:speed_secret.desc": "Watch a Speedometer reach exactly 666 speed", "advancement.create:speed_secret.desc": "Watch a Speedometer reach exactly 69rpm",
"create.subtitle.schematicannon_launch_block": "Schematicannon shoots", "create.subtitle.schematicannon_launch_block": "Schematicannon shoots",
"create.subtitle.schematicannon_finish": "Schematicannon finishes", "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.condition1": "When used on Sapling",
"item.create.tree_fertilizer.tooltip.behaviour1": "Grows Trees _regardless_ of their _spacing_ _conditions_", "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": "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.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", "item.create.filter.tooltip.condition1": "When in filter slot",
@ -889,13 +894,23 @@
"block.create.flywheel.tooltip.condition1": "When Attached to Running Engine", "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.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": "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.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.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": "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.condition1": "When Rotated",
"block.create.sticky_mechanical_piston.tooltip.behaviour1": "Starts moving the attached structure. Speed and direction correlate to the incoming Rotation Speed.", "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Starts moving the attached structure. Speed and direction correlate to the incoming Rotation Speed.",
@ -907,10 +922,25 @@
"block.create.mechanical_bearing.tooltip": "MECHANICAL BEARING", "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.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.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.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.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": "TRANSLATION CHASSIS",
"block.create.translation_chassis.tooltip.summary": "A configurable base block connecting structures for movement.", "block.create.translation_chassis.tooltip.summary": "A configurable base block connecting structures for movement.",
"block.create.translation_chassis.tooltip.condition1": "When Moved", "block.create.translation_chassis.tooltip.condition1": "When Moved",
@ -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.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": "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.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.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.drill.tooltip.behaviour2": "Breaks Blocks the drill is running into.",
"block.create.harvester.tooltip": "MECHANICAL HARVESTER", "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.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": "When Pushed by Mechanical Piston", "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.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": "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.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.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.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.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": "STOCKSWITCH",
"block.create.stockswitch.tooltip.summary": "Toggles a Redstone signal based on the _Storage_ _Space_ in the attached Container.", "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.redstone_bridge.tooltip.action2": "Toggles between _Receiver_ and _Transmitter_ Mode.",
"block.create.contact.tooltip": "REDSTONE CONTACT", "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.condition1": "When facing other Contact",
"block.create.contact.tooltip.behaviour1": "Provides a _Redstone_ _Signal_", "block.create.contact.tooltip.behaviour1": "Provides a _Redstone_ _Signal_",
"block.create.contact.tooltip.condition2": "When moved by Mechanical Piston", "block.create.contact.tooltip.condition2": "While Moving",
"block.create.contact.tooltip.behaviour2": "Triggers all stationary Contacts passing by", "block.create.contact.tooltip.behaviour2": "Triggers all stationary Contacts passed by",
"block.create.flexcrate.tooltip": "ADJUSTABLE CRATE", "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", "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.condition1": "When Powered by Redstone",
"block.create.extractor.tooltip.behaviour1": "_Pauses_ the Extractor", "block.create.extractor.tooltip.behaviour1": "_Pauses_ the Extractor",
"block.create.extractor.tooltip.control1": "R-Click on Filter Space", "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": "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._", "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,10 +1036,19 @@
"block.create.linked_extractor.tooltip.condition1": "When Redstone Link Active", "block.create.linked_extractor.tooltip.condition1": "When Redstone Link Active",
"block.create.linked_extractor.tooltip.behaviour1": "_Pauses_ the Extractor", "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.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.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_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": "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._", "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._",
@ -1039,6 +1087,12 @@
"block.create.analog_lever.tooltip": "ANALOG LEVER", "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.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": "SPEEDOMETER",
"block.create.speed_gauge.tooltip.summary": "Measures and displays the _rotational_ _speed_ of attached kinetic components.", "block.create.speed_gauge.tooltip.summary": "Measures and displays the _rotational_ _speed_ of attached kinetic components.",
"block.create.speed_gauge.tooltip.condition1": "When Rotated", "block.create.speed_gauge.tooltip.condition1": "When Rotated",

View file

@ -10,7 +10,7 @@
"item": "create:andesite_alloy" "item": "create:andesite_alloy"
}, },
"frame": "task", "frame": "task",
"show_toast": false, "show_toast": true,
"announce_to_chat": false, "announce_to_chat": false,
"hidden": true "hidden": true
}, },

View file

@ -1,8 +1,7 @@
{ {
"display": { "display": {
"title": { "title": {
"translate": "advancement.create:andesite_casing", "translate": "advancement.create:andesite_casing"
"color": "gray"
}, },
"description": { "description": {
"translate": "advancement.create:andesite_casing.desc" "translate": "advancement.create:andesite_casing.desc"

View file

@ -1,10 +1,10 @@
{ {
"display": { "display": {
"title": { "title": {
"text": "brass_casing" "translate": "advancement.create:brass_casing"
}, },
"description": { "description": {
"text": "Description" "translate": "advancement.create:brass_casing.desc"
}, },
"icon": { "icon": {
"item": "create:brass_casing" "item": "create:brass_casing"

View file

@ -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"
}

View file

@ -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"
}

View file

@ -13,7 +13,7 @@
"frame": "task", "frame": "task",
"show_toast": true, "show_toast": true,
"announce_to_chat": false, "announce_to_chat": false,
"hidden": false "hidden": true
}, },
"criteria": { "criteria": {
"quartz": { "quartz": {

View file

@ -12,7 +12,7 @@
}, },
"frame": "goal", "frame": "goal",
"show_toast": true, "show_toast": true,
"announce_to_chat": false, "announce_to_chat": true,
"hidden": false "hidden": false
}, },
"criteria": { "criteria": {

View file

@ -1,7 +1,7 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "create:placement_handgun" "item": "create:brass_ingot"
}, },
"title": { "title": {
"translate": "advancement.create:root" "translate": "advancement.create:root"
@ -9,7 +9,7 @@
"description": { "description": {
"translate": "advancement.create:root.desc" "translate": "advancement.create:root.desc"
}, },
"background": "create:textures/block/gabbro_layers.png", "background": "create:textures/block/scoria_bricks.png",
"show_toast": false, "show_toast": false,
"announce_to_chat": false "announce_to_chat": false
}, },

View file

@ -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"
}

View file

@ -13,7 +13,7 @@
"frame": "task", "frame": "task",
"show_toast": true, "show_toast": true,
"announce_to_chat": false, "announce_to_chat": false,
"hidden": false "hidden": true
}, },
"criteria": { "criteria": {
"paperNormal": { "paperNormal": {
@ -43,5 +43,5 @@
"paperRed" "paperRed"
] ]
], ],
"parent": "create:gear" "parent": "create:root"
} }

View file

@ -8,7 +8,7 @@
"translate": "advancement.create:sand_paper_secret.desc" "translate": "advancement.create:sand_paper_secret.desc"
}, },
"icon": { "icon": {
"item": "create:sand_paper" "item": "create:red_sand_paper"
}, },
"frame": "goal", "frame": "goal",
"show_toast": true, "show_toast": true,

View file

@ -1,8 +1,7 @@
{ {
"display": { "display": {
"title": { "title": {
"translate": "advancement.create:shadow_steel", "translate": "advancement.create:shadow_steel"
"color": "black"
}, },
"description": { "description": {
"translate": "advancement.create:shadow_steel.desc" "translate": "advancement.create:shadow_steel.desc"

View file

@ -8,7 +8,7 @@
"translate": "advancement.create:speed_secret.desc" "translate": "advancement.create:speed_secret.desc"
}, },
"icon": { "icon": {
"item": "create:rose_quartz" "item": "create:speed_gauge"
}, },
"frame": "goal", "frame": "goal",
"show_toast": true, "show_toast": true,

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:allium" "item": "minecraft:allium"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:andesite" "item": "minecraft:andesite"
@ -9,13 +8,7 @@
"results": [ "results": [
{ {
"item": "minecraft:cobblestone", "item": "minecraft:cobblestone",
"count": 1, "count": 1
"chance": 0.5
},
{
"item": "minecraft:diorite",
"count": 1,
"chance": 0.25
} }
], ],
"processingTime": 200 "processingTime": 200

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:azure_bluet" "item": "minecraft:azure_bluet"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:blaze_rod" "item": "minecraft:blaze_rod"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:bone" "item": "minecraft:bone"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:bone_meal" "item": "minecraft:bone_meal"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:cactus" "item": "minecraft:cactus"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:charcoal" "item": "minecraft:charcoal"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:clay" "item": "minecraft:clay"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:coal" "item": "minecraft:coal"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:coal_ore" "item": "minecraft:coal_ore"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:cobblestone" "item": "minecraft:cobblestone"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:cocoa_beans" "item": "minecraft:cocoa_beans"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"tag": "forge:ores/copper" "tag": "forge:ores/copper"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:cornflower" "item": "minecraft:cornflower"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:dandelion" "item": "minecraft:dandelion"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:diamond_horse_armor" "item": "minecraft:diamond_horse_armor"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:diamond_ore" "item": "minecraft:diamond_ore"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:diorite" "item": "minecraft:diorite"
@ -8,13 +7,8 @@
], ],
"results": [ "results": [
{ {
"item": "minecraft:cobblestone", "item": "create:limesand",
"count": 1 "count": 1
},
{
"item": "minecraft:quartz",
"count": 1,
"chance": 0.125
} }
], ],
"processingTime": 200 "processingTime": 200

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:emerald_ore" "item": "minecraft:emerald_ore"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:fern" "item": "minecraft:fern"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"tag": "forge:ores/gold" "tag": "forge:ores/gold"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:golden_horse_armor" "item": "minecraft:golden_horse_armor"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:granite" "item": "minecraft:granite"
@ -8,13 +7,8 @@
], ],
"results": [ "results": [
{ {
"item": "minecraft:diorite", "item": "minecraft:red_sand",
"count": 1 "count": 1
},
{
"item": "minecraft:quartz",
"count": 1,
"chance": 0.125
} }
], ],
"processingTime": 200 "processingTime": 200

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:grass" "item": "minecraft:grass"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:gravel" "item": "minecraft:gravel"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:ink_sac" "item": "minecraft:ink_sac"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:iron_horse_armor" "item": "minecraft:iron_horse_armor"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"tag": "forge:ores/iron" "tag": "forge:ores/iron"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:lapis_lazuli" "item": "minecraft:lapis_lazuli"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:lapis_ore" "item": "minecraft:lapis_ore"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:large_fern" "item": "minecraft:large_fern"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:lilac" "item": "minecraft:lilac"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:lily_of_the_valley" "item": "minecraft:lily_of_the_valley"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:nether_quartz_ore" "item": "minecraft:nether_quartz_ore"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:obsidian" "item": "minecraft:obsidian"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:orange_tulip" "item": "minecraft:orange_tulip"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:oxeye_daisy" "item": "minecraft:oxeye_daisy"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:peony" "item": "minecraft:peony"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:pink_tulip" "item": "minecraft:pink_tulip"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:poppy" "item": "minecraft:poppy"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:prismarine_crystals" "item": "minecraft:prismarine_crystals"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:red_tulip" "item": "minecraft:red_tulip"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:redstone_ore" "item": "minecraft:redstone_ore"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:rose_bush" "item": "minecraft:rose_bush"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:saddle" "item": "minecraft:saddle"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:sand" "item": "minecraft:sand"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:sugar_cane" "item": "minecraft:sugar_cane"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:sunflower" "item": "minecraft:sunflower"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:tall_grass" "item": "minecraft:tall_grass"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:terracotta" "item": "minecraft:terracotta"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:wheat" "item": "minecraft:wheat"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:white_tulip" "item": "minecraft:white_tulip"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:wither_rose" "item": "minecraft:wither_rose"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"tag": "minecraft:wool" "tag": "minecraft:wool"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:crushing", "type": "create:crushing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"tag": "forge:ores/zinc" "tag": "forge:ores/zinc"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:acacia_log" "item": "minecraft:acacia_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "create:andesite_alloy" "item": "create:andesite_alloy"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:birch_log" "item": "minecraft:birch_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:dark_oak_log" "item": "minecraft:dark_oak_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:jungle_log" "item": "minecraft:jungle_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:oak_log" "item": "minecraft:oak_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:spruce_log" "item": "minecraft:spruce_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:stripped_acacia_log" "item": "minecraft:stripped_acacia_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:stripped_birch_log" "item": "minecraft:stripped_birch_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:stripped_dark_oak_log" "item": "minecraft:stripped_dark_oak_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:stripped_jungle_log" "item": "minecraft:stripped_jungle_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:stripped_oak_log" "item": "minecraft:stripped_oak_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:cutting", "type": "create:cutting",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:stripped_spruce_log" "item": "minecraft:stripped_spruce_log"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:mixing", "type": "create:mixing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:andesite" "item": "minecraft:andesite"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:mixing", "type": "create:mixing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"item": "minecraft:andesite" "item": "minecraft:andesite"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:mixing", "type": "create:mixing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"tag": "forge:nuggets/copper" "tag": "forge:nuggets/copper"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:mixing", "type": "create:mixing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"tag": "forge:dusts/glowstone" "tag": "forge:dusts/glowstone"

View file

@ -1,6 +1,5 @@
{ {
"type": "create:pressing", "type": "create:pressing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"tag": "forge:ingots/brass" "tag": "forge:ingots/brass"
@ -11,6 +10,5 @@
"item": "create:brass_sheet", "item": "create:brass_sheet",
"count": 1 "count": 1
} }
], ]
"processingTime": 100
} }

View file

@ -1,6 +1,5 @@
{ {
"type": "create:pressing", "type": "create:pressing",
"group": "minecraft:misc",
"ingredients": [ "ingredients": [
{ {
"tag": "forge:ingots/copper" "tag": "forge:ingots/copper"
@ -11,6 +10,5 @@
"item": "create:copper_sheet", "item": "create:copper_sheet",
"count": 1 "count": 1
} }
], ]
"processingTime": 100
} }

Some files were not shown because too many files have changed in this diff Show more