From c8872b61b03a71d5d74972840100d1182c1af0b2 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 22 Sep 2019 20:23:26 +0200 Subject: [PATCH] Bug Busting 0.1 Part III - Cached rotating models no longer get their UVs screwed by resource reloading - Added Limesand and Recipes, Fixes #11 - Added Block Tag for everything usable by the Generating Encased Fan, Fixes #12 - Fixed FlexPeater not able to be configured while pulsing - Stealth nerfs - Fixed Blockzapper upgrades not registering correctly, Fixes #14 - Updated Stair recipes, Fixes #10 - Fixed Schematic sender crashing while finishing an upload - Fixed Corner models for reversed Stair Blocks - Fixed crash on startup without JEI --- .../com/simibubi/create/AllBlockTags.java | 5 +- .../java/com/simibubi/create/AllBlocks.java | 2 + .../java/com/simibubi/create/AllRecipes.java | 3 +- .../com/simibubi/create/ClientEvents.java | 4 +- .../com/simibubi/create/CreateClient.java | 16 ++- .../create/compat/jei/AnimatedKinetics.java | 8 +- .../create/compat/jei/AnimatedPress.java | 2 + .../compat/jei/AnimationTickHolder.java | 11 +++ .../simibubi/create/compat/jei/CreateJEI.java | 8 +- .../contraptions/CachedBufferReloader.java | 28 ++++++ .../base/KineticTileEntityRenderer.java | 5 + .../receivers/EncasedFanTileEntity.java | 8 +- .../MechanicalBearingTileEntityRenderer.java | 5 + .../MechanicalPistonTileEntityRenderer.java | 5 + .../BuilderGunUpgradeRecipe.java | 11 +-- .../diodes/ConfigureFlexpeaterPacket.java | 2 + .../block/diodes/FlexpeaterTileEntity.java | 20 ++-- .../diodes/FlexpeaterTileEntityRenderer.java | 10 +- .../schematics/ClientSchematicLoader.java | 17 ++-- .../blockstates/dolomite_bricks_stairs.json | 51 ---------- .../create/blockstates/dolomite_stairs.json | 91 ++++++++---------- .../blockstates/gabbro_bricks_stairs.json | 91 ++++++++---------- .../create/blockstates/gabbro_stairs.json | 91 ++++++++---------- .../assets/create/blockstates/limesand.json | 7 ++ .../blockstates/limestone_bricks_stairs.json | 91 ++++++++---------- .../create/blockstates/limestone_stairs.json | 91 ++++++++---------- .../weathered_limestone_bricks_stairs.json | 91 ++++++++---------- .../weathered_limestone_stairs.json | 91 ++++++++---------- .../resources/assets/create/lang/en_us.json | 1 + .../models/block/palettes/limesand.json | 6 ++ .../assets/create/models/item/limesand.json | 3 + .../assets/create/textures/block/limesand.png | Bin 0 -> 711 bytes .../create/loot_tables/blocks/limesand.json | 20 ++++ .../gold_accelerator.json | 2 +- .../gold_amplifier.json | 2 +- .../gold_body.json | 2 +- .../gold_retriever.json | 2 +- .../gold_scope.json | 2 +- .../purpur_accelerator.json | 2 +- .../purpur_amplifier.json | 2 +- .../purpur_body.json | 2 +- .../purpur_retriever.json | 2 +- .../purpur_scope.json | 2 +- .../data/create/recipes/crafting/motor.json | 2 +- .../recipes/crafting/palettes/desktop.ini | 37 ------- .../crafting/palettes/dolomite_stairs.json | 2 +- .../palettes/gabbro_bricks_stairs.json | 2 +- .../crafting/palettes/gabbro_stairs.json | 2 +- .../recipes/crafting/palettes/limesand.json | 25 +++++ .../palettes/limestone_bricks_stairs.json | 2 +- .../crafting/palettes/limestone_stairs.json | 2 +- .../weathered_limestone_bricks_stairs.json | 2 +- .../palettes/weathered_limestone_stairs.json | 2 +- .../data/create/recipes/crushing/sand.json | 26 +++++ .../create/recipes/smelting/limestone.json | 2 +- .../data/create/recipes/splashing/gravel.json | 4 +- .../create/recipes/splashing/red_sand.json | 2 +- .../data/create/tags/blocks/fan_heaters.json | 6 ++ 58 files changed, 537 insertions(+), 496 deletions(-) create mode 100644 src/main/java/com/simibubi/create/compat/jei/AnimationTickHolder.java create mode 100644 src/main/java/com/simibubi/create/modules/contraptions/CachedBufferReloader.java delete mode 100644 src/main/resources/assets/create/blockstates/dolomite_bricks_stairs.json create mode 100644 src/main/resources/assets/create/blockstates/limesand.json create mode 100644 src/main/resources/assets/create/models/block/palettes/limesand.json create mode 100644 src/main/resources/assets/create/models/item/limesand.json create mode 100644 src/main/resources/assets/create/textures/block/limesand.png create mode 100644 src/main/resources/data/create/loot_tables/blocks/limesand.json rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/gold_accelerator.json (90%) rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/gold_amplifier.json (90%) rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/gold_body.json (89%) rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/gold_retriever.json (90%) rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/gold_scope.json (90%) rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/purpur_accelerator.json (90%) rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/purpur_amplifier.json (90%) rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/purpur_body.json (89%) rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/purpur_retriever.json (90%) rename src/main/resources/data/create/recipes/{placement_handgun_upgrades => blockzapper_upgrade}/purpur_scope.json (90%) delete mode 100644 src/main/resources/data/create/recipes/crafting/palettes/desktop.ini create mode 100644 src/main/resources/data/create/recipes/crafting/palettes/limesand.json create mode 100644 src/main/resources/data/create/recipes/crushing/sand.json create mode 100644 src/main/resources/data/create/tags/blocks/fan_heaters.json diff --git a/src/main/java/com/simibubi/create/AllBlockTags.java b/src/main/java/com/simibubi/create/AllBlockTags.java index 71864a2a0..15690638b 100644 --- a/src/main/java/com/simibubi/create/AllBlockTags.java +++ b/src/main/java/com/simibubi/create/AllBlockTags.java @@ -8,7 +8,10 @@ import net.minecraft.util.ResourceLocation; public enum AllBlockTags { - WINDMILL_SAILS; + WINDMILL_SAILS, + FAN_HEATERS, + + ; public Tag tag; diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 06362e269..f04093824 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -53,6 +53,7 @@ import net.minecraft.block.Block; import net.minecraft.block.Block.Properties; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.FallingBlock; import net.minecraft.block.FenceBlock; import net.minecraft.block.FenceGateBlock; import net.minecraft.block.RotatedPillarBlock; @@ -141,6 +142,7 @@ public enum AllBlocks { INDENTED_GABBRO(new Block(Properties.from(GABBRO.block)), ComesWith.SLAB), SLIGHTLY_MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))), MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))), + LIMESAND(new FallingBlock(Properties.from(Blocks.SAND))), LIMESTONE(new Block(Properties.from(Blocks.SANDSTONE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), LIMESTONE_BRICKS(new Block(Properties.from(LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), POLISHED_LIMESTONE(new Block(Properties.from(LIMESTONE.block)), ComesWith.SLAB), diff --git a/src/main/java/com/simibubi/create/AllRecipes.java b/src/main/java/com/simibubi/create/AllRecipes.java index f77466f78..6757954aa 100644 --- a/src/main/java/com/simibubi/create/AllRecipes.java +++ b/src/main/java/com/simibubi/create/AllRecipes.java @@ -18,7 +18,7 @@ import net.minecraftforge.event.RegistryEvent; public enum AllRecipes { - PLACEMENT_HANDGUN_UPGRADE(BuilderGunUpgradeRecipe.Serializer::new, Types.BLOCKZAPPER_UPGRADE), + BLOCKZAPPER_UPGRADE(BuilderGunUpgradeRecipe.Serializer::new, IRecipeType.CRAFTING), CRUSHING(() -> new ProcessingRecipeSerializer<>(CrushingRecipe::new), Types.CRUSHING), SPLASHING(() -> new ProcessingRecipeSerializer<>(SplashingRecipe::new), Types.SPLASHING), PRESSING(() -> new ProcessingRecipeSerializer<>(PressingRecipe::new), Types.PRESSING), @@ -29,7 +29,6 @@ public enum AllRecipes { public static IRecipeType CRUSHING = register("crushing"); public static IRecipeType SPLASHING = register("splashing"); public static IRecipeType PRESSING = register("pressing"); - public static IRecipeType BLOCKZAPPER_UPGRADE = register("blockzapper_upgrade"); static > IRecipeType register(final String key) { return Registry.register(Registry.RECIPE_TYPE, new ResourceLocation(key), new IRecipeType() { diff --git a/src/main/java/com/simibubi/create/ClientEvents.java b/src/main/java/com/simibubi/create/ClientEvents.java index 6a1514c99..a77b9bdd2 100644 --- a/src/main/java/com/simibubi/create/ClientEvents.java +++ b/src/main/java/com/simibubi/create/ClientEvents.java @@ -3,7 +3,7 @@ package com.simibubi.create; import java.util.ArrayList; import java.util.List; -import com.simibubi.create.compat.jei.AnimatedKinetics; +import com.simibubi.create.compat.jei.AnimationTickHolder; import com.simibubi.create.foundation.block.IBlockWithScrollableValue; import com.simibubi.create.foundation.gui.ScreenOpener; import com.simibubi.create.foundation.utility.TooltipHelper; @@ -38,7 +38,7 @@ public class ClientEvents { if (event.phase == Phase.START) return; - AnimatedKinetics.tick(); + AnimationTickHolder.tick(); if (!isGameActive()) return; diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index 5397e445b..8ed54062d 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -1,11 +1,15 @@ package com.simibubi.create; +import com.simibubi.create.modules.contraptions.CachedBufferReloader; import com.simibubi.create.modules.contraptions.receivers.EncasedFanParticleHandler; import com.simibubi.create.modules.schematics.ClientSchematicLoader; import com.simibubi.create.modules.schematics.client.SchematicAndQuillHandler; import com.simibubi.create.modules.schematics.client.SchematicHandler; import com.simibubi.create.modules.schematics.client.SchematicHologram; +import net.minecraft.client.Minecraft; +import net.minecraft.resources.IReloadableResourceManager; +import net.minecraft.resources.IResourceManager; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; @@ -22,7 +26,7 @@ public class CreateClient { public static EncasedFanParticleHandler fanParticles; public static ModConfig config; - + @SubscribeEvent public static void clientInit(FMLClientSetupEvent event) { schematicSender = new ClientSchematicLoader(); @@ -30,19 +34,23 @@ public class CreateClient { schematicHologram = new SchematicHologram(); schematicAndQuillHandler = new SchematicAndQuillHandler(); fanParticles = new EncasedFanParticleHandler(); - + AllKeys.register(); AllContainers.registerScreenFactories(); AllTileEntities.registerRenderers(); AllItems.registerColorHandlers(); AllBlocks.registerColorHandlers(); + + IResourceManager resourceManager = Minecraft.getInstance().getResourceManager(); + if (resourceManager instanceof IReloadableResourceManager) + ((IReloadableResourceManager) resourceManager).addReloadListener(new CachedBufferReloader()); } - + @SubscribeEvent public static void createConfigs(ModConfig.ModConfigEvent event) { if (event.getConfig().getSpec() == CreateConfig.specification) return; - + config = event.getConfig(); } diff --git a/src/main/java/com/simibubi/create/compat/jei/AnimatedKinetics.java b/src/main/java/com/simibubi/create/compat/jei/AnimatedKinetics.java index 59571a2a9..b4b443060 100644 --- a/src/main/java/com/simibubi/create/compat/jei/AnimatedKinetics.java +++ b/src/main/java/com/simibubi/create/compat/jei/AnimatedKinetics.java @@ -5,14 +5,8 @@ import net.minecraft.client.Minecraft; public abstract class AnimatedKinetics implements IDrawable { - protected static int ticks; - - public static void tick() { - ticks++; - } - public static float getCurrentAngle() { - return ((ticks + Minecraft.getInstance().getRenderPartialTicks()) * 4f) % 360; + return ((AnimationTickHolder.ticks + Minecraft.getInstance().getRenderPartialTicks()) * 4f) % 360; } } diff --git a/src/main/java/com/simibubi/create/compat/jei/AnimatedPress.java b/src/main/java/com/simibubi/create/compat/jei/AnimatedPress.java index 55fee1255..4980040e3 100644 --- a/src/main/java/com/simibubi/create/compat/jei/AnimatedPress.java +++ b/src/main/java/com/simibubi/create/compat/jei/AnimatedPress.java @@ -1,5 +1,7 @@ package com.simibubi.create.compat.jei; +import static com.simibubi.create.compat.jei.AnimationTickHolder.ticks; + import com.mojang.blaze3d.platform.GlStateManager; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.ScreenElementRenderer; diff --git a/src/main/java/com/simibubi/create/compat/jei/AnimationTickHolder.java b/src/main/java/com/simibubi/create/compat/jei/AnimationTickHolder.java new file mode 100644 index 000000000..08c03df78 --- /dev/null +++ b/src/main/java/com/simibubi/create/compat/jei/AnimationTickHolder.java @@ -0,0 +1,11 @@ +package com.simibubi.create.compat.jei; + +public class AnimationTickHolder { + + protected static int ticks; + + public static void tick() { + ticks++; + } + +} diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index 084157341..d4fbef785 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -64,7 +64,8 @@ public class CreateJEI implements IModPlugin { registration.addRecipes(findRecipes(AllRecipes.CRUSHING), crushingCategory.getUid()); registration.addRecipes(findRecipes(AllRecipes.SPLASHING), splashingCategory.getUid()); registration.addRecipes(findRecipes(AllRecipes.PRESSING), pressingCategory.getUid()); - registration.addRecipes(findRecipes(AllRecipes.PLACEMENT_HANDGUN_UPGRADE), blockzapperCategory.getUid()); + registration.addRecipes(findRecipesById(AllRecipes.BLOCKZAPPER_UPGRADE.serializer.getRegistryName()), + blockzapperCategory.getUid()); registration.addRecipes(findRecipesByType(IRecipeType.SMOKING), smokingCategory.getUid()); registration.addRecipes(findRecipesByTypeExcluding(IRecipeType.SMELTING, IRecipeType.SMOKING), blastingCategory.getUid()); @@ -98,6 +99,11 @@ public class CreateJEI implements IModPlugin { .collect(Collectors.toList()); } + private static List> findRecipesById(ResourceLocation id) { + return Minecraft.getInstance().world.getRecipeManager().getRecipes().stream() + .filter(r -> r.getSerializer().getRegistryName().equals(id)).collect(Collectors.toList()); + } + private static List> findRecipesByTypeExcluding(IRecipeType type, IRecipeType excludingType) { List> byType = findRecipesByType(type); List> byExcludingType = findRecipesByType(excludingType); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/CachedBufferReloader.java b/src/main/java/com/simibubi/create/modules/contraptions/CachedBufferReloader.java new file mode 100644 index 000000000..713c83f90 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/CachedBufferReloader.java @@ -0,0 +1,28 @@ +package com.simibubi.create.modules.contraptions; + +import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.modules.contraptions.receivers.constructs.MechanicalBearingTileEntityRenderer; +import com.simibubi.create.modules.contraptions.receivers.constructs.MechanicalPistonTileEntityRenderer; +import com.simibubi.create.modules.logistics.block.diodes.FlexpeaterTileEntityRenderer; + +import net.minecraft.client.resources.ReloadListener; +import net.minecraft.profiler.IProfiler; +import net.minecraft.resources.IResourceManager; + +public class CachedBufferReloader extends ReloadListener { + + @Override + protected String prepare(IResourceManager resourceManagerIn, IProfiler profilerIn) { + return ""; + } + + @Override + protected void apply(String splashList, IResourceManager resourceManagerIn, IProfiler profilerIn) { + KineticTileEntityRenderer.invalidateCache(); + MechanicalPistonTileEntityRenderer.invalidateCache(); + MechanicalBearingTileEntityRenderer.invalidateCache(); + FlexpeaterTileEntityRenderer.invalidateCache(); + } + + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java index 85d6a4cc9..6d7b876ae 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java @@ -119,4 +119,9 @@ public class KineticTileEntityRenderer extends TileEntityRendererFast getType() { - return AllRecipes.Types.BLOCKZAPPER_UPGRADE; - } +// @Override +// public IRecipeType getType() { +// return AllRecipes.Types.BLOCKZAPPER_UPGRADE; +// } @Override public IRecipeSerializer getSerializer() { - return AllRecipes.PLACEMENT_HANDGUN_UPGRADE.serializer; + return AllRecipes.BLOCKZAPPER_UPGRADE.serializer; } public static class Serializer extends ForgeRegistryEntry> implements IRecipeSerializer { diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ConfigureFlexpeaterPacket.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ConfigureFlexpeaterPacket.java index 6112a7af8..75431b3b6 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ConfigureFlexpeaterPacket.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ConfigureFlexpeaterPacket.java @@ -4,6 +4,7 @@ import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; public class ConfigureFlexpeaterPacket extends TileEntityConfigurationPacket { @@ -31,6 +32,7 @@ public class ConfigureFlexpeaterPacket extends TileEntityConfigurationPacket= maxState; + boolean atMin = state <= 0; if (!charging && powered) charging = true; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java index 0436fc336..619ed0638 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java @@ -33,12 +33,12 @@ public class FlexpeaterTileEntityRenderer extends TileEntityRendererFast> 16); byte g = (byte) ((color >> 8) & 0xFF); byte b = (byte) (color & 0xFF); byte a = (byte) 255; - + for (int vertex = 0; vertex < vertexCount(original); vertex++) { putColor(mutable, vertex, r, g, b, a); putPos(mutable, vertex, getX(original, vertex) + xIn, getY(original, vertex) + yIn, @@ -50,7 +50,7 @@ public class FlexpeaterTileEntityRenderer extends TileEntityRendererFastPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0$fQ%K~y+T6;fMr zoG=gsJrQqq<7J(=oO0#*xj`x?$PJPY+p**IzF1f!B!mPR|IANMx4L^2{`~QMeY3J= zwALX^s#V#Xj>{5Uud=GjG|P<9%e=VRjaqL%e?du-?05UDCrB_rSpzSV0sEWJUvf z+DMqz4zGV-5ei0Q2_aqE9`{G@=4xFiWq=?=jLxSsW?YDL31&OFyZbvrXq*a>h?`F} z3Ktg9YuA;lyjrid9uQ~5SsjKU@^cTp0*zPvFOo%W};Id_*H5z1h- z>v~wVquy*bYEYYP?VMwbO`~70S0ScFm3!yQsz8vvZQ49bg8=1arPRPU>#sdnIyV=_ zDaIrgj8ayvS81A}w(B4br3jSXcYDeR4g*3-*EC5S2TPD<@yqk89gXZ&*LEn4Q>CO^ z!lt6aY`vKsg6!nQOV(>R)l6K;e0&a)SEOFloCLpx->5^#(moWn&mlE#27)|FNlKmAT6rhza4xN tKQFhpwbuIS@riQ|Hh@fU09r*={0Hh?Xc7b~hbI64002ovPDHLkV1n3ZHW2^- literal 0 HcmV?d00001 diff --git a/src/main/resources/data/create/loot_tables/blocks/limesand.json b/src/main/resources/data/create/loot_tables/blocks/limesand.json new file mode 100644 index 000000000..2299a5e93 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/limesand.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "create:limesand", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:limesand" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_accelerator.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_accelerator.json similarity index 90% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_accelerator.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_accelerator.json index 82d506a15..18d9e62c7 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_accelerator.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_accelerator.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ "SE", "BS" diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_amplifier.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_amplifier.json similarity index 90% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_amplifier.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_amplifier.json index d0d73b505..ddbfad010 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_amplifier.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_amplifier.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ "E ", "BR" diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_body.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_body.json similarity index 89% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_body.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_body.json index 306f7e53c..a9ef3d8a3 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_body.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_body.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ " B ", "BEB", diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_retriever.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_retriever.json similarity index 90% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_retriever.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_retriever.json index 9f862adfe..8fdc9b6e2 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_retriever.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_retriever.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ "E ", "BR" diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_scope.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_scope.json similarity index 90% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_scope.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_scope.json index 86b2f82f7..5ec675892 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_scope.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_scope.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ "GBG", " E " diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_accelerator.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_accelerator.json similarity index 90% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_accelerator.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_accelerator.json index db1b49d99..9437cd321 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_accelerator.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_accelerator.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ "SE", "BS" diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_amplifier.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_amplifier.json similarity index 90% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_amplifier.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_amplifier.json index c8c585f20..0ed6df7cb 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_amplifier.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_amplifier.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ "BR", "E ", diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_body.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_body.json similarity index 89% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_body.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_body.json index 1a2fc1ccc..9b9895a59 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_body.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_body.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ " B ", "BEB", diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_retriever.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_retriever.json similarity index 90% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_retriever.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_retriever.json index 7b657d5a4..24debe385 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_retriever.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_retriever.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ "E ", "BR" diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_scope.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_scope.json similarity index 90% rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_scope.json rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_scope.json index a3d0ae48b..3af352b8d 100644 --- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_scope.json +++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_scope.json @@ -1,5 +1,5 @@ { - "type": "create:placement_handgun_upgrade", + "type": "create:blockzapper_upgrade", "pattern": [ "GBG", " E " diff --git a/src/main/resources/data/create/recipes/crafting/motor.json b/src/main/resources/data/create/recipes/crafting/motor.json index 5bc80460f..928f7a183 100644 --- a/src/main/resources/data/create/recipes/crafting/motor.json +++ b/src/main/resources/data/create/recipes/crafting/motor.json @@ -7,7 +7,7 @@ ], "key": { "B": { - "item": "create:blaze_brass_cube" + "item": "create:chorus_chrome_cube" }, "A": { "item": "create:iron_sheet" diff --git a/src/main/resources/data/create/recipes/crafting/palettes/desktop.ini b/src/main/resources/data/create/recipes/crafting/palettes/desktop.ini deleted file mode 100644 index 2ce3d7e57..000000000 --- a/src/main/resources/data/create/recipes/crafting/palettes/desktop.ini +++ /dev/null @@ -1,37 +0,0 @@ -[LocalizedFileNames] -weathered_limestone.json=@weathered_limestone.json,0 -weathered_limestone_bricks.json=@weathered_limestone_bricks.json,0 -limestone_bricks.json=@limestone_bricks.json,0 -polished_weathered_limestone.json=@polished_weathered_limestone.json,0 -polished_limestone.json=@polished_limestone.json,0 -polished_weathered_limestone_slab.json=@polished_weathered_limestone_slab.json,0 -weathered_limestone_bricks_slab.json=@weathered_limestone_bricks_slab.json,0 -weathered_limestone_slab.json=@weathered_limestone_slab.json,0 -polished_limestone_slab.json=@polished_limestone_slab.json,0 -limestone_slab.json=@limestone_slab.json,0 -limestone_bricks_slab.json=@limestone_bricks_slab.json,0 -limestone_bricks_wall.json=@limestone_bricks_wall.json,0 -weathered_limestone_bricks_wall.json=@weathered_limestone_bricks_wall.json,0 -weathered_limestone_wall.json=@weathered_limestone_wall.json,0 -limestone_wall.json=@limestone_wall.json,0 -weathered_limestone_stairs.json=@weathered_limestone_stairs.json,0 -weathered_limestone_bricks_stairs.json=@weathered_limestone_bricks_stairs.json,0 -limestone_bricks_stairs.json=@limestone_bricks_stairs.json,0 -limestone_stairs.json=@limestone_stairs.json,0 -limestone.json=@limestone.json,0 -gabbro.json=@gabbro.json,0 -gabbro_bricks.json=@gabbro_bricks.json,0 -polished_gabbro.json=@polished_gabbro.json,0 -paved_gabbro_bricks_slab.json=@paved_gabbro_bricks_slab.json,0 -indented_gabbro_slab.json=@indented_gabbro_slab.json,0 -gabbro_slab.json=@gabbro_slab.json,0 -gabbro_wall.json=@gabbro_wall.json,0 -gabbro_bricks_wall.json=@gabbro_bricks_wall.json,0 -gabbro_bricks_stairs.json=@gabbro_bricks_stairs.json,0 -gabbro_stairs.json=@gabbro_stairs.json,0 -dolomite.json=@dolomite.json,0 -polished_dolomite.json=@polished_dolomite.json,0 -dolomite_bricks.json=@dolomite_bricks.json,0 -dolomite_slab.json=@dolomite_slab.json,0 -dolomite_wall.json=@dolomite_wall.json,0 -dolomite_stairs.json=@dolomite_stairs.json,0 diff --git a/src/main/resources/data/create/recipes/crafting/palettes/dolomite_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/dolomite_stairs.json index 8de7753b7..75a6d0b8e 100644 --- a/src/main/resources/data/create/recipes/crafting/palettes/dolomite_stairs.json +++ b/src/main/resources/data/create/recipes/crafting/palettes/dolomite_stairs.json @@ -12,7 +12,7 @@ }, "result": { "item": "create:dolomite_stairs", - "count": 8 + "count": 4 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting/palettes/gabbro_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/gabbro_bricks_stairs.json index 7cd9b93f2..0eacbcd24 100644 --- a/src/main/resources/data/create/recipes/crafting/palettes/gabbro_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/crafting/palettes/gabbro_bricks_stairs.json @@ -12,7 +12,7 @@ }, "result": { "item": "create:gabbro_bricks_stairs", - "count": 8 + "count": 4 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting/palettes/gabbro_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/gabbro_stairs.json index 3f8d9593a..b2a9d1d38 100644 --- a/src/main/resources/data/create/recipes/crafting/palettes/gabbro_stairs.json +++ b/src/main/resources/data/create/recipes/crafting/palettes/gabbro_stairs.json @@ -12,7 +12,7 @@ }, "result": { "item": "create:gabbro_stairs", - "count": 8 + "count": 4 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting/palettes/limesand.json b/src/main/resources/data/create/recipes/crafting/palettes/limesand.json new file mode 100644 index 000000000..936f5b40e --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting/palettes/limesand.json @@ -0,0 +1,25 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "WL", + "LW" + ], + "key": { + "L": { + "item": "minecraft:sand" + }, + "W": { + "item": "minecraft:diorite" + } + }, + "result": { + "item": "create:limesand", + "count": 4 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting/palettes/limestone_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/limestone_bricks_stairs.json index 8b318aaad..65157573e 100644 --- a/src/main/resources/data/create/recipes/crafting/palettes/limestone_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/crafting/palettes/limestone_bricks_stairs.json @@ -12,7 +12,7 @@ }, "result": { "item": "create:limestone_bricks_stairs", - "count": 8 + "count": 4 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting/palettes/limestone_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/limestone_stairs.json index 401d064ac..7f5eb1c55 100644 --- a/src/main/resources/data/create/recipes/crafting/palettes/limestone_stairs.json +++ b/src/main/resources/data/create/recipes/crafting/palettes/limestone_stairs.json @@ -12,7 +12,7 @@ }, "result": { "item": "create:limestone_stairs", - "count": 8 + "count": 4 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_bricks_stairs.json index ad69f31e9..cbf762b9e 100644 --- a/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_bricks_stairs.json @@ -12,7 +12,7 @@ }, "result": { "item": "create:weathered_limestone_bricks_stairs", - "count": 8 + "count": 4 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_stairs.json index 542d036ec..f7353945c 100644 --- a/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_stairs.json +++ b/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_stairs.json @@ -12,7 +12,7 @@ }, "result": { "item": "create:weathered_limestone_stairs", - "count": 8 + "count": 4 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crushing/sand.json b/src/main/resources/data/create/recipes/crushing/sand.json new file mode 100644 index 000000000..3d88700c4 --- /dev/null +++ b/src/main/resources/data/create/recipes/crushing/sand.json @@ -0,0 +1,26 @@ +{ + "type": "create:crushing", + "group": "minecraft:misc", + "ingredients": [ + { + "item": "minecraft:sand" + } + ], + "results": [ + { + "item": "create:limesand", + "count": 1 + }, + { + "item": "create:limesand", + "count": 1, + "chance": 0.5 + }, + { + "item": "minecraft:bone_meal", + "count": 1, + "chance": 0.05 + } + ], + "processingTime": 50 +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/limestone.json b/src/main/resources/data/create/recipes/smelting/limestone.json index 315e75da0..fe20e0a03 100644 --- a/src/main/resources/data/create/recipes/smelting/limestone.json +++ b/src/main/resources/data/create/recipes/smelting/limestone.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "minecraft:sandstone" + "item": "create:limesand" }, "result": "create:limestone", "experience": 0.1, diff --git a/src/main/resources/data/create/recipes/splashing/gravel.json b/src/main/resources/data/create/recipes/splashing/gravel.json index 8a6d02167..19cd6dfa1 100644 --- a/src/main/resources/data/create/recipes/splashing/gravel.json +++ b/src/main/resources/data/create/recipes/splashing/gravel.json @@ -10,11 +10,11 @@ { "item": "minecraft:flint", "count": 1, - "chance": 0.5 + "chance": 0.25 }, { "item": "minecraft:iron_nugget", - "count": 4, + "count": 1, "chance": 0.125 } ], 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 83b9f2a5b..40d00217d 100644 --- a/src/main/resources/data/create/recipes/splashing/red_sand.json +++ b/src/main/resources/data/create/recipes/splashing/red_sand.json @@ -9,7 +9,7 @@ "results": [ { "item": "minecraft:gold_nugget", - "count": 4, + "count": 3, "chance": 0.125 }, { diff --git a/src/main/resources/data/create/tags/blocks/fan_heaters.json b/src/main/resources/data/create/tags/blocks/fan_heaters.json new file mode 100644 index 000000000..2e38dca24 --- /dev/null +++ b/src/main/resources/data/create/tags/blocks/fan_heaters.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:fire", "minecraft:campfire", "minecraft:lava", "minecraft:magma_block" + ] +} \ No newline at end of file