mirror of
https://github.com/Jozufozu/Flywheel.git
synced 2025-02-21 17:35:33 +01:00
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
This commit is contained in:
parent
687e96135a
commit
c8872b61b0
58 changed files with 537 additions and 496 deletions
|
@ -8,7 +8,10 @@ import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
public enum AllBlockTags {
|
public enum AllBlockTags {
|
||||||
|
|
||||||
WINDMILL_SAILS;
|
WINDMILL_SAILS,
|
||||||
|
FAN_HEATERS,
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
public Tag<Block> tag;
|
public Tag<Block> tag;
|
||||||
|
|
||||||
|
|
|
@ -53,6 +53,7 @@ import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.Block.Properties;
|
import net.minecraft.block.Block.Properties;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.block.Blocks;
|
import net.minecraft.block.Blocks;
|
||||||
|
import net.minecraft.block.FallingBlock;
|
||||||
import net.minecraft.block.FenceBlock;
|
import net.minecraft.block.FenceBlock;
|
||||||
import net.minecraft.block.FenceGateBlock;
|
import net.minecraft.block.FenceGateBlock;
|
||||||
import net.minecraft.block.RotatedPillarBlock;
|
import net.minecraft.block.RotatedPillarBlock;
|
||||||
|
@ -141,6 +142,7 @@ public enum AllBlocks {
|
||||||
INDENTED_GABBRO(new Block(Properties.from(GABBRO.block)), ComesWith.SLAB),
|
INDENTED_GABBRO(new Block(Properties.from(GABBRO.block)), ComesWith.SLAB),
|
||||||
SLIGHTLY_MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))),
|
SLIGHTLY_MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))),
|
||||||
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(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),
|
LIMESTONE_BRICKS(new Block(Properties.from(LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
|
||||||
POLISHED_LIMESTONE(new Block(Properties.from(LIMESTONE.block)), ComesWith.SLAB),
|
POLISHED_LIMESTONE(new Block(Properties.from(LIMESTONE.block)), ComesWith.SLAB),
|
||||||
|
|
|
@ -18,7 +18,7 @@ import net.minecraftforge.event.RegistryEvent;
|
||||||
|
|
||||||
public enum AllRecipes {
|
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),
|
CRUSHING(() -> new ProcessingRecipeSerializer<>(CrushingRecipe::new), Types.CRUSHING),
|
||||||
SPLASHING(() -> new ProcessingRecipeSerializer<>(SplashingRecipe::new), Types.SPLASHING),
|
SPLASHING(() -> new ProcessingRecipeSerializer<>(SplashingRecipe::new), Types.SPLASHING),
|
||||||
PRESSING(() -> new ProcessingRecipeSerializer<>(PressingRecipe::new), Types.PRESSING),
|
PRESSING(() -> new ProcessingRecipeSerializer<>(PressingRecipe::new), Types.PRESSING),
|
||||||
|
@ -29,7 +29,6 @@ public enum AllRecipes {
|
||||||
public static IRecipeType<CrushingRecipe> CRUSHING = register("crushing");
|
public static IRecipeType<CrushingRecipe> CRUSHING = register("crushing");
|
||||||
public static IRecipeType<SplashingRecipe> SPLASHING = register("splashing");
|
public static IRecipeType<SplashingRecipe> SPLASHING = register("splashing");
|
||||||
public static IRecipeType<PressingRecipe> PRESSING = register("pressing");
|
public static IRecipeType<PressingRecipe> PRESSING = register("pressing");
|
||||||
public static IRecipeType<BuilderGunUpgradeRecipe> BLOCKZAPPER_UPGRADE = register("blockzapper_upgrade");
|
|
||||||
|
|
||||||
static <T extends IRecipe<?>> IRecipeType<T> register(final String key) {
|
static <T extends IRecipe<?>> IRecipeType<T> register(final String key) {
|
||||||
return Registry.register(Registry.RECIPE_TYPE, new ResourceLocation(key), new IRecipeType<T>() {
|
return Registry.register(Registry.RECIPE_TYPE, new ResourceLocation(key), new IRecipeType<T>() {
|
||||||
|
|
|
@ -3,7 +3,7 @@ package com.simibubi.create;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
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.block.IBlockWithScrollableValue;
|
||||||
import com.simibubi.create.foundation.gui.ScreenOpener;
|
import com.simibubi.create.foundation.gui.ScreenOpener;
|
||||||
import com.simibubi.create.foundation.utility.TooltipHelper;
|
import com.simibubi.create.foundation.utility.TooltipHelper;
|
||||||
|
@ -38,7 +38,7 @@ public class ClientEvents {
|
||||||
if (event.phase == Phase.START)
|
if (event.phase == Phase.START)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
AnimatedKinetics.tick();
|
AnimationTickHolder.tick();
|
||||||
|
|
||||||
if (!isGameActive())
|
if (!isGameActive())
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1,11 +1,15 @@
|
||||||
package com.simibubi.create;
|
package com.simibubi.create;
|
||||||
|
|
||||||
|
import com.simibubi.create.modules.contraptions.CachedBufferReloader;
|
||||||
import com.simibubi.create.modules.contraptions.receivers.EncasedFanParticleHandler;
|
import com.simibubi.create.modules.contraptions.receivers.EncasedFanParticleHandler;
|
||||||
import com.simibubi.create.modules.schematics.ClientSchematicLoader;
|
import com.simibubi.create.modules.schematics.ClientSchematicLoader;
|
||||||
import com.simibubi.create.modules.schematics.client.SchematicAndQuillHandler;
|
import com.simibubi.create.modules.schematics.client.SchematicAndQuillHandler;
|
||||||
import com.simibubi.create.modules.schematics.client.SchematicHandler;
|
import com.simibubi.create.modules.schematics.client.SchematicHandler;
|
||||||
import com.simibubi.create.modules.schematics.client.SchematicHologram;
|
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.eventbus.api.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||||
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
|
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
|
||||||
|
@ -22,7 +26,7 @@ public class CreateClient {
|
||||||
public static EncasedFanParticleHandler fanParticles;
|
public static EncasedFanParticleHandler fanParticles;
|
||||||
|
|
||||||
public static ModConfig config;
|
public static ModConfig config;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void clientInit(FMLClientSetupEvent event) {
|
public static void clientInit(FMLClientSetupEvent event) {
|
||||||
schematicSender = new ClientSchematicLoader();
|
schematicSender = new ClientSchematicLoader();
|
||||||
|
@ -30,19 +34,23 @@ public class CreateClient {
|
||||||
schematicHologram = new SchematicHologram();
|
schematicHologram = new SchematicHologram();
|
||||||
schematicAndQuillHandler = new SchematicAndQuillHandler();
|
schematicAndQuillHandler = new SchematicAndQuillHandler();
|
||||||
fanParticles = new EncasedFanParticleHandler();
|
fanParticles = new EncasedFanParticleHandler();
|
||||||
|
|
||||||
AllKeys.register();
|
AllKeys.register();
|
||||||
AllContainers.registerScreenFactories();
|
AllContainers.registerScreenFactories();
|
||||||
AllTileEntities.registerRenderers();
|
AllTileEntities.registerRenderers();
|
||||||
AllItems.registerColorHandlers();
|
AllItems.registerColorHandlers();
|
||||||
AllBlocks.registerColorHandlers();
|
AllBlocks.registerColorHandlers();
|
||||||
|
|
||||||
|
IResourceManager resourceManager = Minecraft.getInstance().getResourceManager();
|
||||||
|
if (resourceManager instanceof IReloadableResourceManager)
|
||||||
|
((IReloadableResourceManager) resourceManager).addReloadListener(new CachedBufferReloader());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void createConfigs(ModConfig.ModConfigEvent event) {
|
public static void createConfigs(ModConfig.ModConfigEvent event) {
|
||||||
if (event.getConfig().getSpec() == CreateConfig.specification)
|
if (event.getConfig().getSpec() == CreateConfig.specification)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
config = event.getConfig();
|
config = event.getConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,14 +5,8 @@ import net.minecraft.client.Minecraft;
|
||||||
|
|
||||||
public abstract class AnimatedKinetics implements IDrawable {
|
public abstract class AnimatedKinetics implements IDrawable {
|
||||||
|
|
||||||
protected static int ticks;
|
|
||||||
|
|
||||||
public static void tick() {
|
|
||||||
ticks++;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static float getCurrentAngle() {
|
public static float getCurrentAngle() {
|
||||||
return ((ticks + Minecraft.getInstance().getRenderPartialTicks()) * 4f) % 360;
|
return ((AnimationTickHolder.ticks + Minecraft.getInstance().getRenderPartialTicks()) * 4f) % 360;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package com.simibubi.create.compat.jei;
|
package com.simibubi.create.compat.jei;
|
||||||
|
|
||||||
|
import static com.simibubi.create.compat.jei.AnimationTickHolder.ticks;
|
||||||
|
|
||||||
import com.mojang.blaze3d.platform.GlStateManager;
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
import com.simibubi.create.AllBlocks;
|
import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.foundation.gui.ScreenElementRenderer;
|
import com.simibubi.create.foundation.gui.ScreenElementRenderer;
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
package com.simibubi.create.compat.jei;
|
||||||
|
|
||||||
|
public class AnimationTickHolder {
|
||||||
|
|
||||||
|
protected static int ticks;
|
||||||
|
|
||||||
|
public static void tick() {
|
||||||
|
ticks++;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -64,7 +64,8 @@ public class CreateJEI implements IModPlugin {
|
||||||
registration.addRecipes(findRecipes(AllRecipes.CRUSHING), crushingCategory.getUid());
|
registration.addRecipes(findRecipes(AllRecipes.CRUSHING), crushingCategory.getUid());
|
||||||
registration.addRecipes(findRecipes(AllRecipes.SPLASHING), splashingCategory.getUid());
|
registration.addRecipes(findRecipes(AllRecipes.SPLASHING), splashingCategory.getUid());
|
||||||
registration.addRecipes(findRecipes(AllRecipes.PRESSING), pressingCategory.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(findRecipesByType(IRecipeType.SMOKING), smokingCategory.getUid());
|
||||||
registration.addRecipes(findRecipesByTypeExcluding(IRecipeType.SMELTING, IRecipeType.SMOKING),
|
registration.addRecipes(findRecipesByTypeExcluding(IRecipeType.SMELTING, IRecipeType.SMOKING),
|
||||||
blastingCategory.getUid());
|
blastingCategory.getUid());
|
||||||
|
@ -98,6 +99,11 @@ public class CreateJEI implements IModPlugin {
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static List<IRecipe<?>> findRecipesById(ResourceLocation id) {
|
||||||
|
return Minecraft.getInstance().world.getRecipeManager().getRecipes().stream()
|
||||||
|
.filter(r -> r.getSerializer().getRegistryName().equals(id)).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
private static List<IRecipe<?>> findRecipesByTypeExcluding(IRecipeType<?> type, IRecipeType<?> excludingType) {
|
private static List<IRecipe<?>> findRecipesByTypeExcluding(IRecipeType<?> type, IRecipeType<?> excludingType) {
|
||||||
List<IRecipe<?>> byType = findRecipesByType(type);
|
List<IRecipe<?>> byType = findRecipesByType(type);
|
||||||
List<IRecipe<?>> byExcludingType = findRecipesByType(excludingType);
|
List<IRecipe<?>> byExcludingType = findRecipesByType(excludingType);
|
||||||
|
|
|
@ -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<String> {
|
||||||
|
|
||||||
|
@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();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -119,4 +119,9 @@ public class KineticTileEntityRenderer extends TileEntityRendererFast<KineticTil
|
||||||
return te.getBlockState();
|
return te.getBlockState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void invalidateCache() {
|
||||||
|
if (cachedBuffers != null)
|
||||||
|
cachedBuffers.clear();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ import static net.minecraft.util.Direction.AxisDirection.POSITIVE;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.simibubi.create.AllBlockTags;
|
||||||
import com.simibubi.create.AllBlocks;
|
import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.AllTileEntities;
|
import com.simibubi.create.AllTileEntities;
|
||||||
import com.simibubi.create.CreateClient;
|
import com.simibubi.create.CreateClient;
|
||||||
|
@ -91,8 +92,7 @@ public class EncasedFanTileEntity extends KineticTileEntity implements ITickable
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateGenerator() {
|
public void updateGenerator() {
|
||||||
boolean shouldGenerate = world.isBlockPowered(pos) && world.isBlockPresent(pos.down())
|
boolean shouldGenerate = world.isBlockPowered(pos) && world.isBlockPresent(pos.down()) && blockBelowIsHot();
|
||||||
&& world.getBlockState(pos.down()).getBlock() == Blocks.FIRE;
|
|
||||||
if (shouldGenerate == isGenerator)
|
if (shouldGenerate == isGenerator)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -103,6 +103,10 @@ public class EncasedFanTileEntity extends KineticTileEntity implements ITickable
|
||||||
sendData();
|
sendData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean blockBelowIsHot() {
|
||||||
|
return world.getBlockState(pos.down()).getBlock().isIn(AllBlockTags.FAN_HEATERS.tag);
|
||||||
|
}
|
||||||
|
|
||||||
protected void updateReachAndForce() {
|
protected void updateReachAndForce() {
|
||||||
if (getWorld() == null)
|
if (getWorld() == null)
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -110,5 +110,10 @@ public class MechanicalBearingTileEntityRenderer extends KineticTileEntityRender
|
||||||
return AllBlocks.SHAFT.block.getDefaultState().with(BlockStateProperties.AXIS,
|
return AllBlocks.SHAFT.block.getDefaultState().with(BlockStateProperties.AXIS,
|
||||||
((IRotate) te.getBlockState().getBlock()).getRotationAxis(te.getBlockState()));
|
((IRotate) te.getBlockState().getBlock()).getRotationAxis(te.getBlockState()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void invalidateCache() {
|
||||||
|
if (cachedConstructs != null)
|
||||||
|
cachedConstructs.invalidateAll();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,5 +89,10 @@ public class MechanicalPistonTileEntityRenderer extends KineticTileEntityRendere
|
||||||
return AllBlocks.SHAFT.block.getDefaultState().with(BlockStateProperties.AXIS,
|
return AllBlocks.SHAFT.block.getDefaultState().with(BlockStateProperties.AXIS,
|
||||||
((IRotate) te.getBlockState().getBlock()).getRotationAxis(te.getBlockState()));
|
((IRotate) te.getBlockState().getBlock()).getRotationAxis(te.getBlockState()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void invalidateCache() {
|
||||||
|
if (cachedConstructs != null)
|
||||||
|
cachedConstructs.invalidateAll();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@ import net.minecraft.inventory.CraftingInventory;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.item.crafting.ICraftingRecipe;
|
import net.minecraft.item.crafting.ICraftingRecipe;
|
||||||
import net.minecraft.item.crafting.IRecipeSerializer;
|
import net.minecraft.item.crafting.IRecipeSerializer;
|
||||||
import net.minecraft.item.crafting.IRecipeType;
|
|
||||||
import net.minecraft.item.crafting.ShapedRecipe;
|
import net.minecraft.item.crafting.ShapedRecipe;
|
||||||
import net.minecraft.network.PacketBuffer;
|
import net.minecraft.network.PacketBuffer;
|
||||||
import net.minecraft.util.JSONUtils;
|
import net.minecraft.util.JSONUtils;
|
||||||
|
@ -64,14 +63,14 @@ public class BuilderGunUpgradeRecipe implements ICraftingRecipe {
|
||||||
return getRecipe().getId();
|
return getRecipe().getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
// @Override
|
||||||
public IRecipeType<?> getType() {
|
// public IRecipeType<?> getType() {
|
||||||
return AllRecipes.Types.BLOCKZAPPER_UPGRADE;
|
// return AllRecipes.Types.BLOCKZAPPER_UPGRADE;
|
||||||
}
|
// }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IRecipeSerializer<?> getSerializer() {
|
public IRecipeSerializer<?> getSerializer() {
|
||||||
return AllRecipes.PLACEMENT_HANDGUN_UPGRADE.serializer;
|
return AllRecipes.BLOCKZAPPER_UPGRADE.serializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Serializer extends ForgeRegistryEntry<IRecipeSerializer<?>> implements IRecipeSerializer<BuilderGunUpgradeRecipe> {
|
public static class Serializer extends ForgeRegistryEntry<IRecipeSerializer<?>> implements IRecipeSerializer<BuilderGunUpgradeRecipe> {
|
||||||
|
|
|
@ -4,6 +4,7 @@ import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket;
|
||||||
|
|
||||||
import net.minecraft.network.PacketBuffer;
|
import net.minecraft.network.PacketBuffer;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.math.MathHelper;
|
||||||
|
|
||||||
public class ConfigureFlexpeaterPacket extends TileEntityConfigurationPacket<FlexpeaterTileEntity> {
|
public class ConfigureFlexpeaterPacket extends TileEntityConfigurationPacket<FlexpeaterTileEntity> {
|
||||||
|
|
||||||
|
@ -31,6 +32,7 @@ public class ConfigureFlexpeaterPacket extends TileEntityConfigurationPacket<Fle
|
||||||
@Override
|
@Override
|
||||||
protected void applySettings(FlexpeaterTileEntity te) {
|
protected void applySettings(FlexpeaterTileEntity te) {
|
||||||
te.maxState = maxState;
|
te.maxState = maxState;
|
||||||
|
te.state = MathHelper.clamp(te.state, 0, maxState);
|
||||||
te.sendData();
|
te.sendData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,17 +21,23 @@ public class FlexpeaterTileEntity extends SyncedTileEntity implements ITickableT
|
||||||
|
|
||||||
public FlexpeaterTileEntity() {
|
public FlexpeaterTileEntity() {
|
||||||
super(AllTileEntities.FLEXPEATER.type);
|
super(AllTileEntities.FLEXPEATER.type);
|
||||||
lastModified = -1;
|
lastModified = -1;
|
||||||
maxState = 1;
|
maxState = newMaxState = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void read(CompoundNBT compound) {
|
public void read(CompoundNBT compound) {
|
||||||
|
readClientUpdate(compound);
|
||||||
|
newMaxState = maxState;
|
||||||
|
super.read(compound);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void readClientUpdate(CompoundNBT compound) {
|
||||||
state = compound.getInt("State");
|
state = compound.getInt("State");
|
||||||
charging = compound.getBoolean("Charging");
|
charging = compound.getBoolean("Charging");
|
||||||
newMaxState = maxState = compound.getInt("MaxState");
|
maxState = compound.getInt("MaxState");
|
||||||
lastModified = -1;
|
state = MathHelper.clamp(state, 0, maxState - 1);
|
||||||
super.read(compound);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -95,8 +101,8 @@ public class FlexpeaterTileEntity extends SyncedTileEntity implements ITickableT
|
||||||
updateConfigurableValue();
|
updateConfigurableValue();
|
||||||
boolean powered = getBlockState().get(POWERED);
|
boolean powered = getBlockState().get(POWERED);
|
||||||
boolean powering = getBlockState().get(POWERING);
|
boolean powering = getBlockState().get(POWERING);
|
||||||
boolean atMax = state == maxState;
|
boolean atMax = state >= maxState;
|
||||||
boolean atMin = state == 0;
|
boolean atMin = state <= 0;
|
||||||
|
|
||||||
if (!charging && powered)
|
if (!charging && powered)
|
||||||
charging = true;
|
charging = true;
|
||||||
|
|
|
@ -33,12 +33,12 @@ public class FlexpeaterTileEntityRenderer extends TileEntityRendererFast<Flexpea
|
||||||
mutable.rewind();
|
mutable.rewind();
|
||||||
|
|
||||||
int color = ColorHelper.mixColors(0x2C0300, 0xCD0000, colorModifier);
|
int color = ColorHelper.mixColors(0x2C0300, 0xCD0000, colorModifier);
|
||||||
|
|
||||||
byte r = (byte) (color >> 16);
|
byte r = (byte) (color >> 16);
|
||||||
byte g = (byte) ((color >> 8) & 0xFF);
|
byte g = (byte) ((color >> 8) & 0xFF);
|
||||||
byte b = (byte) (color & 0xFF);
|
byte b = (byte) (color & 0xFF);
|
||||||
byte a = (byte) 255;
|
byte a = (byte) 255;
|
||||||
|
|
||||||
for (int vertex = 0; vertex < vertexCount(original); vertex++) {
|
for (int vertex = 0; vertex < vertexCount(original); vertex++) {
|
||||||
putColor(mutable, vertex, r, g, b, a);
|
putColor(mutable, vertex, r, g, b, a);
|
||||||
putPos(mutable, vertex, getX(original, vertex) + xIn, getY(original, vertex) + yIn,
|
putPos(mutable, vertex, getX(original, vertex) + xIn, getY(original, vertex) + yIn,
|
||||||
|
@ -50,7 +50,7 @@ public class FlexpeaterTileEntityRenderer extends TileEntityRendererFast<Flexpea
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private FlexpeaterIndicatorRenderer cachedIndicator;
|
protected static FlexpeaterIndicatorRenderer cachedIndicator;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderTileEntityFast(FlexpeaterTileEntity te, double x, double y, double z, float partialTicks,
|
public void renderTileEntityFast(FlexpeaterTileEntity te, double x, double y, double z, float partialTicks,
|
||||||
|
@ -80,4 +80,8 @@ public class FlexpeaterTileEntityRenderer extends TileEntityRendererFast<Flexpea
|
||||||
te.state / (float) te.maxState, packedLightmapCoords));
|
te.state / (float) te.maxState, packedLightmapCoords));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void invalidateCache() {
|
||||||
|
cachedIndicator = null;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,15 +90,16 @@ public class ClientSchematicLoader {
|
||||||
byte[] data = new byte[maxPacketSize];
|
byte[] data = new byte[maxPacketSize];
|
||||||
try {
|
try {
|
||||||
int status = activeUploads.get(schematic).read(data);
|
int status = activeUploads.get(schematic).read(data);
|
||||||
if (status < maxPacketSize) {
|
|
||||||
data = Arrays.copyOf(data, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Minecraft.getInstance().world != null)
|
if (status != -1) {
|
||||||
AllPackets.channel.sendToServer(SchematicUploadPacket.write(schematic, data));
|
if (status < maxPacketSize)
|
||||||
else {
|
data = Arrays.copyOf(data, status);
|
||||||
activeUploads.remove(schematic);
|
if (Minecraft.getInstance().world != null)
|
||||||
return;
|
AllPackets.channel.sendToServer(SchematicUploadPacket.write(schematic, data));
|
||||||
|
else {
|
||||||
|
activeUploads.remove(schematic);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status < maxPacketSize)
|
if (status < maxPacketSize)
|
||||||
|
|
|
@ -1,51 +0,0 @@
|
||||||
{
|
|
||||||
"forge_marker": 1,
|
|
||||||
"defaults": {
|
|
||||||
"uvlock": true
|
|
||||||
},
|
|
||||||
"variants": {
|
|
||||||
"facing":{
|
|
||||||
"east":{},
|
|
||||||
"west":{"y": 180},
|
|
||||||
"south":{"y": 90},
|
|
||||||
"north":{"y": 270}
|
|
||||||
},
|
|
||||||
"half":{
|
|
||||||
"bottom":{},
|
|
||||||
"top":{"x": 180}
|
|
||||||
},
|
|
||||||
"shape":{
|
|
||||||
"straight":{"model":"create:block/palettes/dolomite_bricks_stairs"},
|
|
||||||
"outer_right":{"model":"create:block/palettes/dolomite_bricks_stairs_outer"},
|
|
||||||
"outer_left":{"model":"create:block/palettes/dolomite_bricks_stairs_outer"},
|
|
||||||
"inner_right":{"model":"create:block/palettes/dolomite_bricks_stairs_inner"},
|
|
||||||
"inner_left":{"model":"create:block/palettes/dolomite_bricks_stairs_inner"}
|
|
||||||
},
|
|
||||||
"facing=east,half=bottom,shape=outer_left": {"y": 270},
|
|
||||||
"facing=west,half=bottom,shape=outer_left": {"y": 90},
|
|
||||||
"facing=south,half=bottom,shape=outer_left": {"y": 0},
|
|
||||||
"facing=north,half=bottom,shape=outer_left": {"y": 180},
|
|
||||||
"facing=east,half=bottom,shape=inner_left": {"y": 270},
|
|
||||||
"facing=west,half=bottom,shape=inner_left": {"y": 90},
|
|
||||||
"facing=south,half=bottom,shape=inner_left": {"y": 0},
|
|
||||||
"facing=north,half=bottom,shape=inner_left": {"y": 180},
|
|
||||||
"facing=west,half=top,shape=straight": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=straight": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=straight": {"x": 180, "y": 270},
|
|
||||||
"facing=west,half=top,shape=outer_right": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
|
|
||||||
"facing=east,half=top,shape=outer_left": {"x": 180, "y": 90},
|
|
||||||
"facing=west,half=top,shape=outer_left": {"x": 180, "y": 270},
|
|
||||||
"facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
|
|
||||||
"facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
|
|
||||||
"facing=east,half=top,shape=inner_right": {"x": 180, "y": 0},
|
|
||||||
"facing=west,half=top,shape=inner_right": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
|
|
||||||
"facing=east,half=top,shape=inner_left": {"x": 180, "y": 90},
|
|
||||||
"facing=west,half=top,shape=inner_left": {"x": 180, "y": 270},
|
|
||||||
"facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
|
|
||||||
"facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,51 +1,44 @@
|
||||||
{
|
{
|
||||||
"forge_marker": 1,
|
"variants": {
|
||||||
"defaults": {
|
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/dolomite_stairs" },
|
||||||
"uvlock": true
|
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "y": 90, "uvlock": true },
|
||||||
"variants": {
|
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "y": 270, "uvlock": true },
|
||||||
"facing":{
|
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer" },
|
||||||
"east":{},
|
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"west":{"y": 180},
|
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"south":{"y": 90},
|
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "y": 270, "uvlock": true },
|
||||||
"north":{"y": 270}
|
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "y": 270, "uvlock": true },
|
||||||
},
|
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"half":{
|
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer" },
|
||||||
"bottom":{},
|
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"top":{"x": 180}
|
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner" },
|
||||||
},
|
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "y": 180, "uvlock": true },
|
||||||
"shape":{
|
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"straight":{"model":"create:block/palettes/dolomite_stairs"},
|
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_right":{"model":"create:block/palettes/dolomite_stairs_outer"},
|
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_left":{"model":"create:block/palettes/dolomite_stairs_outer"},
|
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"inner_right":{"model":"create:block/palettes/dolomite_stairs_inner"},
|
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner" },
|
||||||
"inner_left":{"model":"create:block/palettes/dolomite_stairs_inner"}
|
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "x": 180, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=outer_left": {"y": 270},
|
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=outer_left": {"y": 90},
|
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=outer_left": {"y": 0},
|
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=outer_left": {"y": 180},
|
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=inner_left": {"y": 270},
|
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=inner_left": {"y": 90},
|
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=inner_left": {"y": 0},
|
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=inner_left": {"y": 180},
|
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=straight": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=straight": {"x": 180, "y": 90},
|
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=north,half=top,shape=straight": {"x": 180, "y": 270},
|
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_right": {"x": 180, "y": 180},
|
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
|
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
|
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=east,half=top,shape=outer_left": {"x": 180, "y": 90},
|
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_left": {"x": 180, "y": 270},
|
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
|
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=top,shape=inner_right": {"x": 180, "y": 0},
|
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 270, "uvlock": true }
|
||||||
"facing=west,half=top,shape=inner_right": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
|
|
||||||
"facing=east,half=top,shape=inner_left": {"x": 180, "y": 90},
|
|
||||||
"facing=west,half=top,shape=inner_left": {"x": 180, "y": 270},
|
|
||||||
"facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
|
|
||||||
"facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,51 +1,44 @@
|
||||||
{
|
{
|
||||||
"forge_marker": 1,
|
"variants": {
|
||||||
"defaults": {
|
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs" },
|
||||||
"uvlock": true
|
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "y": 90, "uvlock": true },
|
||||||
"variants": {
|
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "y": 270, "uvlock": true },
|
||||||
"facing":{
|
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer" },
|
||||||
"east":{},
|
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"west":{"y": 180},
|
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"south":{"y": 90},
|
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 270, "uvlock": true },
|
||||||
"north":{"y": 270}
|
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 270, "uvlock": true },
|
||||||
},
|
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"half":{
|
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer" },
|
||||||
"bottom":{},
|
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"top":{"x": 180}
|
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner" },
|
||||||
},
|
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 180, "uvlock": true },
|
||||||
"shape":{
|
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"straight":{"model":"create:block/palettes/gabbro_bricks_stairs"},
|
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_right":{"model":"create:block/palettes/gabbro_bricks_stairs_outer"},
|
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_left":{"model":"create:block/palettes/gabbro_bricks_stairs_outer"},
|
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"inner_right":{"model":"create:block/palettes/gabbro_bricks_stairs_inner"},
|
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner" },
|
||||||
"inner_left":{"model":"create:block/palettes/gabbro_bricks_stairs_inner"}
|
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "x": 180, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=outer_left": {"y": 270},
|
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=outer_left": {"y": 90},
|
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=outer_left": {"y": 0},
|
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=outer_left": {"y": 180},
|
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=inner_left": {"y": 270},
|
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=inner_left": {"y": 90},
|
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=inner_left": {"y": 0},
|
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=inner_left": {"y": 180},
|
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=straight": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=straight": {"x": 180, "y": 90},
|
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=north,half=top,shape=straight": {"x": 180, "y": 270},
|
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_right": {"x": 180, "y": 180},
|
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
|
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
|
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=east,half=top,shape=outer_left": {"x": 180, "y": 90},
|
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_left": {"x": 180, "y": 270},
|
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
|
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=top,shape=inner_right": {"x": 180, "y": 0},
|
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true }
|
||||||
"facing=west,half=top,shape=inner_right": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
|
|
||||||
"facing=east,half=top,shape=inner_left": {"x": 180, "y": 90},
|
|
||||||
"facing=west,half=top,shape=inner_left": {"x": 180, "y": 270},
|
|
||||||
"facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
|
|
||||||
"facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,51 +1,44 @@
|
||||||
{
|
{
|
||||||
"forge_marker": 1,
|
"variants": {
|
||||||
"defaults": {
|
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_stairs" },
|
||||||
"uvlock": true
|
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "y": 90, "uvlock": true },
|
||||||
"variants": {
|
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "y": 270, "uvlock": true },
|
||||||
"facing":{
|
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer" },
|
||||||
"east":{},
|
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"west":{"y": 180},
|
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"south":{"y": 90},
|
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "y": 270, "uvlock": true },
|
||||||
"north":{"y": 270}
|
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "y": 270, "uvlock": true },
|
||||||
},
|
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"half":{
|
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer" },
|
||||||
"bottom":{},
|
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"top":{"x": 180}
|
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner" },
|
||||||
},
|
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "y": 180, "uvlock": true },
|
||||||
"shape":{
|
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"straight":{"model":"create:block/palettes/gabbro_stairs"},
|
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_right":{"model":"create:block/palettes/gabbro_stairs_outer"},
|
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_left":{"model":"create:block/palettes/gabbro_stairs_outer"},
|
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"inner_right":{"model":"create:block/palettes/gabbro_stairs_inner"},
|
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner" },
|
||||||
"inner_left":{"model":"create:block/palettes/gabbro_stairs_inner"}
|
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "x": 180, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=outer_left": {"y": 270},
|
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=outer_left": {"y": 90},
|
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=outer_left": {"y": 0},
|
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=outer_left": {"y": 180},
|
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=inner_left": {"y": 270},
|
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=inner_left": {"y": 90},
|
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=inner_left": {"y": 0},
|
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=inner_left": {"y": 180},
|
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=straight": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=straight": {"x": 180, "y": 90},
|
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=north,half=top,shape=straight": {"x": 180, "y": 270},
|
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_right": {"x": 180, "y": 180},
|
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
|
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
|
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=east,half=top,shape=outer_left": {"x": 180, "y": 90},
|
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_left": {"x": 180, "y": 270},
|
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
|
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=top,shape=inner_right": {"x": 180, "y": 0},
|
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 270, "uvlock": true }
|
||||||
"facing=west,half=top,shape=inner_right": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
|
|
||||||
"facing=east,half=top,shape=inner_left": {"x": 180, "y": 90},
|
|
||||||
"facing=west,half=top,shape=inner_left": {"x": 180, "y": 270},
|
|
||||||
"facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
|
|
||||||
"facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"forge_marker": 1,
|
||||||
|
"defaults": { "model": "create:block/palettes/limesand" },
|
||||||
|
"variants": {
|
||||||
|
"": [{ "y": 0 }, { "y": 90 }, { "y": 180 }, { "y": 270 }]
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,51 +1,44 @@
|
||||||
{
|
{
|
||||||
"forge_marker": 1,
|
"variants": {
|
||||||
"defaults": {
|
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs" },
|
||||||
"uvlock": true
|
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "y": 90, "uvlock": true },
|
||||||
"variants": {
|
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "y": 270, "uvlock": true },
|
||||||
"facing":{
|
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer" },
|
||||||
"east":{},
|
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"west":{"y": 180},
|
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"south":{"y": 90},
|
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 270, "uvlock": true },
|
||||||
"north":{"y": 270}
|
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 270, "uvlock": true },
|
||||||
},
|
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"half":{
|
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer" },
|
||||||
"bottom":{},
|
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"top":{"x": 180}
|
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner" },
|
||||||
},
|
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 180, "uvlock": true },
|
||||||
"shape":{
|
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"straight":{"model":"create:block/palettes/limestone_bricks_stairs"},
|
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_right":{"model":"create:block/palettes/limestone_bricks_stairs_outer"},
|
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_left":{"model":"create:block/palettes/limestone_bricks_stairs_outer"},
|
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"inner_right":{"model":"create:block/palettes/limestone_bricks_stairs_inner"},
|
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner" },
|
||||||
"inner_left":{"model":"create:block/palettes/limestone_bricks_stairs_inner"}
|
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "x": 180, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=outer_left": {"y": 270},
|
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=outer_left": {"y": 90},
|
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=outer_left": {"y": 0},
|
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=outer_left": {"y": 180},
|
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=inner_left": {"y": 270},
|
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=inner_left": {"y": 90},
|
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=inner_left": {"y": 0},
|
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=inner_left": {"y": 180},
|
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=straight": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=straight": {"x": 180, "y": 90},
|
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=north,half=top,shape=straight": {"x": 180, "y": 270},
|
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_right": {"x": 180, "y": 180},
|
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
|
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
|
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=east,half=top,shape=outer_left": {"x": 180, "y": 90},
|
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_left": {"x": 180, "y": 270},
|
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
|
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=top,shape=inner_right": {"x": 180, "y": 0},
|
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true }
|
||||||
"facing=west,half=top,shape=inner_right": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
|
|
||||||
"facing=east,half=top,shape=inner_left": {"x": 180, "y": 90},
|
|
||||||
"facing=west,half=top,shape=inner_left": {"x": 180, "y": 270},
|
|
||||||
"facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
|
|
||||||
"facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,51 +1,44 @@
|
||||||
{
|
{
|
||||||
"forge_marker": 1,
|
"variants": {
|
||||||
"defaults": {
|
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_stairs" },
|
||||||
"uvlock": true
|
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_stairs", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_stairs", "y": 90, "uvlock": true },
|
||||||
"variants": {
|
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_stairs", "y": 270, "uvlock": true },
|
||||||
"facing":{
|
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer" },
|
||||||
"east":{},
|
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"west":{"y": 180},
|
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"south":{"y": 90},
|
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "y": 270, "uvlock": true },
|
||||||
"north":{"y": 270}
|
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "y": 270, "uvlock": true },
|
||||||
},
|
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"half":{
|
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer" },
|
||||||
"bottom":{},
|
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"top":{"x": 180}
|
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner" },
|
||||||
},
|
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "y": 180, "uvlock": true },
|
||||||
"shape":{
|
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"straight":{"model":"create:block/palettes/limestone_stairs"},
|
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_right":{"model":"create:block/palettes/limestone_stairs_outer"},
|
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_left":{"model":"create:block/palettes/limestone_stairs_outer"},
|
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"inner_right":{"model":"create:block/palettes/limestone_stairs_inner"},
|
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner" },
|
||||||
"inner_left":{"model":"create:block/palettes/limestone_stairs_inner"}
|
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/limestone_stairs", "x": 180, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=outer_left": {"y": 270},
|
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/limestone_stairs", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=outer_left": {"y": 90},
|
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/limestone_stairs", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=outer_left": {"y": 0},
|
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/limestone_stairs", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=outer_left": {"y": 180},
|
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=inner_left": {"y": 270},
|
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=inner_left": {"y": 90},
|
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=inner_left": {"y": 0},
|
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=inner_left": {"y": 180},
|
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=straight": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=straight": {"x": 180, "y": 90},
|
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=north,half=top,shape=straight": {"x": 180, "y": 270},
|
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_right": {"x": 180, "y": 180},
|
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
|
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
|
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=east,half=top,shape=outer_left": {"x": 180, "y": 90},
|
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_left": {"x": 180, "y": 270},
|
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
|
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=top,shape=inner_right": {"x": 180, "y": 0},
|
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 270, "uvlock": true }
|
||||||
"facing=west,half=top,shape=inner_right": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
|
|
||||||
"facing=east,half=top,shape=inner_left": {"x": 180, "y": 90},
|
|
||||||
"facing=west,half=top,shape=inner_left": {"x": 180, "y": 270},
|
|
||||||
"facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
|
|
||||||
"facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,51 +1,44 @@
|
||||||
{
|
{
|
||||||
"forge_marker": 1,
|
"variants": {
|
||||||
"defaults": {
|
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs" },
|
||||||
"uvlock": true
|
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "y": 90, "uvlock": true },
|
||||||
"variants": {
|
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "y": 270, "uvlock": true },
|
||||||
"facing":{
|
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer" },
|
||||||
"east":{},
|
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"west":{"y": 180},
|
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"south":{"y": 90},
|
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 270, "uvlock": true },
|
||||||
"north":{"y": 270}
|
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 270, "uvlock": true },
|
||||||
},
|
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"half":{
|
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer" },
|
||||||
"bottom":{},
|
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"top":{"x": 180}
|
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner" },
|
||||||
},
|
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 180, "uvlock": true },
|
||||||
"shape":{
|
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"straight":{"model":"create:block/palettes/weathered_limestone_bricks_stairs"},
|
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_right":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_outer"},
|
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_left":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_outer"},
|
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"inner_right":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_inner"},
|
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner" },
|
||||||
"inner_left":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_inner"}
|
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "x": 180, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=outer_left": {"y": 270},
|
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=outer_left": {"y": 90},
|
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=outer_left": {"y": 0},
|
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=outer_left": {"y": 180},
|
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=inner_left": {"y": 270},
|
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=inner_left": {"y": 90},
|
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=inner_left": {"y": 0},
|
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=inner_left": {"y": 180},
|
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=straight": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=straight": {"x": 180, "y": 90},
|
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=north,half=top,shape=straight": {"x": 180, "y": 270},
|
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_right": {"x": 180, "y": 180},
|
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
|
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
|
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=east,half=top,shape=outer_left": {"x": 180, "y": 90},
|
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_left": {"x": 180, "y": 270},
|
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
|
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=top,shape=inner_right": {"x": 180, "y": 0},
|
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true }
|
||||||
"facing=west,half=top,shape=inner_right": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
|
|
||||||
"facing=east,half=top,shape=inner_left": {"x": 180, "y": 90},
|
|
||||||
"facing=west,half=top,shape=inner_left": {"x": 180, "y": 270},
|
|
||||||
"facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
|
|
||||||
"facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,51 +1,44 @@
|
||||||
{
|
{
|
||||||
"forge_marker": 1,
|
"variants": {
|
||||||
"defaults": {
|
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs" },
|
||||||
"uvlock": true
|
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "y": 90, "uvlock": true },
|
||||||
"variants": {
|
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "y": 270, "uvlock": true },
|
||||||
"facing":{
|
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer" },
|
||||||
"east":{},
|
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"west":{"y": 180},
|
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"south":{"y": 90},
|
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 270, "uvlock": true },
|
||||||
"north":{"y": 270}
|
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 270, "uvlock": true },
|
||||||
},
|
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 90, "uvlock": true },
|
||||||
"half":{
|
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer" },
|
||||||
"bottom":{},
|
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 180, "uvlock": true },
|
||||||
"top":{"x": 180}
|
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner" },
|
||||||
},
|
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 180, "uvlock": true },
|
||||||
"shape":{
|
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"straight":{"model":"create:block/palettes/weathered_limestone_stairs"},
|
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_right":{"model":"create:block/palettes/weathered_limestone_stairs_outer"},
|
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 270, "uvlock": true },
|
||||||
"outer_left":{"model":"create:block/palettes/weathered_limestone_stairs_outer"},
|
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 90, "uvlock": true },
|
||||||
"inner_right":{"model":"create:block/palettes/weathered_limestone_stairs_inner"},
|
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner" },
|
||||||
"inner_left":{"model":"create:block/palettes/weathered_limestone_stairs_inner"}
|
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 180, "uvlock": true },
|
||||||
},
|
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "x": 180, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=outer_left": {"y": 270},
|
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=outer_left": {"y": 90},
|
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=outer_left": {"y": 0},
|
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=outer_left": {"y": 180},
|
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=bottom,shape=inner_left": {"y": 270},
|
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=bottom,shape=inner_left": {"y": 90},
|
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=bottom,shape=inner_left": {"y": 0},
|
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=north,half=bottom,shape=inner_left": {"y": 180},
|
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=straight": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=straight": {"x": 180, "y": 90},
|
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=north,half=top,shape=straight": {"x": 180, "y": 270},
|
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_right": {"x": 180, "y": 180},
|
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
|
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 270, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
|
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=east,half=top,shape=outer_left": {"x": 180, "y": 90},
|
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=west,half=top,shape=outer_left": {"x": 180, "y": 270},
|
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "uvlock": true },
|
||||||
"facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
|
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 180, "uvlock": true },
|
||||||
"facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
|
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 90, "uvlock": true },
|
||||||
"facing=east,half=top,shape=inner_right": {"x": 180, "y": 0},
|
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 270, "uvlock": true }
|
||||||
"facing=west,half=top,shape=inner_right": {"x": 180, "y": 180},
|
|
||||||
"facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
|
|
||||||
"facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
|
|
||||||
"facing=east,half=top,shape=inner_left": {"x": 180, "y": 90},
|
|
||||||
"facing=west,half=top,shape=inner_left": {"x": 180, "y": 270},
|
|
||||||
"facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
|
|
||||||
"facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,6 +118,7 @@
|
||||||
"block.create.dolomite_bricks_slab": "Dolomite Brick Slab",
|
"block.create.dolomite_bricks_slab": "Dolomite Brick Slab",
|
||||||
"block.create.polished_dolomite": "Polished Dolomite",
|
"block.create.polished_dolomite": "Polished Dolomite",
|
||||||
|
|
||||||
|
"block.create.limesand": "Limesand",
|
||||||
"block.create.limestone": "Limestone",
|
"block.create.limestone": "Limestone",
|
||||||
"block.create.limestone_stairs": "Limestone Stairs",
|
"block.create.limestone_stairs": "Limestone Stairs",
|
||||||
"block.create.limestone_slab": "Limestone Slab",
|
"block.create.limestone_slab": "Limestone Slab",
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "block/cube_all",
|
||||||
|
"textures": {
|
||||||
|
"all": "create:block/limesand"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/palettes/limesand"
|
||||||
|
}
|
BIN
src/main/resources/assets/create/textures/block/limesand.png
Normal file
BIN
src/main/resources/assets/create/textures/block/limesand.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 711 B |
|
@ -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"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"SE",
|
"SE",
|
||||||
"BS"
|
"BS"
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"E ",
|
"E ",
|
||||||
"BR"
|
"BR"
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
" B ",
|
" B ",
|
||||||
"BEB",
|
"BEB",
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"E ",
|
"E ",
|
||||||
"BR"
|
"BR"
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"GBG",
|
"GBG",
|
||||||
" E "
|
" E "
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"SE",
|
"SE",
|
||||||
"BS"
|
"BS"
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"BR",
|
"BR",
|
||||||
"E ",
|
"E ",
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
" B ",
|
" B ",
|
||||||
"BEB",
|
"BEB",
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"E ",
|
"E ",
|
||||||
"BR"
|
"BR"
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"type": "create:placement_handgun_upgrade",
|
"type": "create:blockzapper_upgrade",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"GBG",
|
"GBG",
|
||||||
" E "
|
" E "
|
|
@ -7,7 +7,7 @@
|
||||||
],
|
],
|
||||||
"key": {
|
"key": {
|
||||||
"B": {
|
"B": {
|
||||||
"item": "create:blaze_brass_cube"
|
"item": "create:chorus_chrome_cube"
|
||||||
},
|
},
|
||||||
"A": {
|
"A": {
|
||||||
"item": "create:iron_sheet"
|
"item": "create:iron_sheet"
|
||||||
|
|
|
@ -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
|
|
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"item": "create:dolomite_stairs",
|
"item": "create:dolomite_stairs",
|
||||||
"count": 8
|
"count": 4
|
||||||
},
|
},
|
||||||
"conditions": [
|
"conditions": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"item": "create:gabbro_bricks_stairs",
|
"item": "create:gabbro_bricks_stairs",
|
||||||
"count": 8
|
"count": 4
|
||||||
},
|
},
|
||||||
"conditions": [
|
"conditions": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"item": "create:gabbro_stairs",
|
"item": "create:gabbro_stairs",
|
||||||
"count": 8
|
"count": 4
|
||||||
},
|
},
|
||||||
"conditions": [
|
"conditions": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -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"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"item": "create:limestone_bricks_stairs",
|
"item": "create:limestone_bricks_stairs",
|
||||||
"count": 8
|
"count": 4
|
||||||
},
|
},
|
||||||
"conditions": [
|
"conditions": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"item": "create:limestone_stairs",
|
"item": "create:limestone_stairs",
|
||||||
"count": 8
|
"count": 4
|
||||||
},
|
},
|
||||||
"conditions": [
|
"conditions": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"item": "create:weathered_limestone_bricks_stairs",
|
"item": "create:weathered_limestone_bricks_stairs",
|
||||||
"count": 8
|
"count": 4
|
||||||
},
|
},
|
||||||
"conditions": [
|
"conditions": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"item": "create:weathered_limestone_stairs",
|
"item": "create:weathered_limestone_stairs",
|
||||||
"count": 8
|
"count": 4
|
||||||
},
|
},
|
||||||
"conditions": [
|
"conditions": [
|
||||||
{
|
{
|
||||||
|
|
26
src/main/resources/data/create/recipes/crushing/sand.json
Normal file
26
src/main/resources/data/create/recipes/crushing/sand.json
Normal file
|
@ -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
|
||||||
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"type": "minecraft:smelting",
|
"type": "minecraft:smelting",
|
||||||
"ingredient": {
|
"ingredient": {
|
||||||
"item": "minecraft:sandstone"
|
"item": "create:limesand"
|
||||||
},
|
},
|
||||||
"result": "create:limestone",
|
"result": "create:limestone",
|
||||||
"experience": 0.1,
|
"experience": 0.1,
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
{
|
{
|
||||||
"item": "minecraft:flint",
|
"item": "minecraft:flint",
|
||||||
"count": 1,
|
"count": 1,
|
||||||
"chance": 0.5
|
"chance": 0.25
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "minecraft:iron_nugget",
|
"item": "minecraft:iron_nugget",
|
||||||
"count": 4,
|
"count": 1,
|
||||||
"chance": 0.125
|
"chance": 0.125
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
"results": [
|
"results": [
|
||||||
{
|
{
|
||||||
"item": "minecraft:gold_nugget",
|
"item": "minecraft:gold_nugget",
|
||||||
"count": 4,
|
"count": 3,
|
||||||
"chance": 0.125
|
"chance": 0.125
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"replace": false,
|
||||||
|
"values": [
|
||||||
|
"minecraft:fire", "minecraft:campfire", "minecraft:lava", "minecraft:magma_block"
|
||||||
|
]
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue