diff --git a/build.gradle b/build.gradle index 47541db..52902ea 100644 --- a/build.gradle +++ b/build.gradle @@ -1,77 +1,119 @@ buildscript { repositories { + maven { url = 'https://files.minecraftforge.net/maven' } jcenter() - maven { url = "http://files.minecraftforge.net/maven" } + mavenCentral() } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:3.+' } } -apply plugin: 'net.minecraftforge.gradle.forge' -//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. + +apply plugin: 'net.minecraftforge.gradle' +// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. +apply plugin: 'eclipse' +apply plugin: 'maven-publish' -version = "1.5.2-mc1.12.2" //-mc +version = "1.5.4-mc1.12.2" //-mc group = "derfl007.roads" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "df-roads" -sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. -compileJava { - sourceCompatibility = targetCompatibility = '1.8' -} + +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. minecraft { - version = "1.12.2-14.23.5.2772" - runDir = "run" - - // the mappings can be changed at any time, and must be in the following format. - // snapshot_YYYYMMDD snapshot are built nightly. - // stable_# stables are built at the discretion of the MCP team. + // The mappings can be changed at any time, and must be in the following format. + // snapshot_YYYYMMDD Snapshot are built nightly. + // stable_# Stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not always work. - // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "snapshot_20171003" + // Simply re-run your setup task after changing the mappings to update your workspace. + //mappings channel: 'snapshot', version: '20171003-1.12' + mappings channel: 'snapshot', version: '20171003-1.12' // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. + + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + } + + server { + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + } + } } dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, - // except that these dependencies get remapped to your current MCP mappings - //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' - //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // for more info... + // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed + // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. + // The userdev artifact is a special name and will get all sorts of transformations applied to it. + minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2855' + + // You may put jars on which you depend on in ./libs or you may define them like so.. + // compile "some.group:artifact:version:classifier" + // compile "some.group:artifact:version" + + // Real examples + // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env + // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env + + // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. + // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // These dependencies get remapped to your current MCP mappings + // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // For more info... // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html } -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version +// Example for how to get properties into the manifest for reading by the runtime.. +jar { + manifest { + attributes([ + "Specification-Title": "examplemod", + "Specification-Vendor": "examplemodsareus", + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": "${version}", + "Implementation-Vendor" :"examplemodsareus", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) } - - // copy everything else except the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' +} + +// Example configuration to allow publishing using the maven-publish task +// This is the preferred method to reobfuscate your jar file +jar.finalizedBy('reobfJar') +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing +//publish.dependsOn('reobfJar') + +publishing { + publications { + mavenJava(MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file:///${project.projectDir}/mcmodsrepo" + } } } diff --git a/src/main/java/derfl007/roads/RecipesSign.java b/src/main/java/derfl007/roads/RecipesSign.java index 2148ef7..517c37a 100644 --- a/src/main/java/derfl007/roads/RecipesSign.java +++ b/src/main/java/derfl007/roads/RecipesSign.java @@ -1,12 +1,11 @@ package derfl007.roads; +import static derfl007.roads.init.RoadBlocks.*; + import derfl007.roads.init.RoadItems; import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import static derfl007.roads.init.RoadBlocks.*; @SuppressWarnings("Duplicates") public class RecipesSign { @@ -116,6 +115,17 @@ public class RecipesSign { road_sign_info_17b, //end of town sign road_sign_info_23, // two lanes merge into one road_sign_info_23b, // two lanes merge into one (german) + road_sign_info_24, + road_sign_info_25a, + road_sign_info_25b, + road_sign_info_26a, + road_sign_info_26b, + road_sign_info_26c, + road_sign_info_27a, + road_sign_info_27b, + road_sign_info_27c, + road_sign_info_28a, + road_sign_info_28b, }; public static Block[] signs_3 = { diff --git a/src/main/java/derfl007/roads/Reference.java b/src/main/java/derfl007/roads/Reference.java index de57bed..c99eed7 100644 --- a/src/main/java/derfl007/roads/Reference.java +++ b/src/main/java/derfl007/roads/Reference.java @@ -5,6 +5,8 @@ import net.minecraft.util.text.TextComponentString; public class Reference { + + public static final int TICK_RATE = 20; public static void sayDebugChat(EntityPlayer player, String string) { player.sendStatusMessage(new TextComponentString("[DEBUG]: " + string), true); diff --git a/src/main/java/derfl007/roads/Roads.java b/src/main/java/derfl007/roads/Roads.java index 51845f7..49ad67f 100644 --- a/src/main/java/derfl007/roads/Roads.java +++ b/src/main/java/derfl007/roads/Roads.java @@ -1,5 +1,7 @@ package derfl007.roads; +import java.io.File; + import org.apache.logging.log4j.Logger; import derfl007.roads.common.commands.CommandTrafficLights; @@ -33,6 +35,7 @@ import derfl007.roads.world.WorldGenOre; import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; @@ -46,7 +49,7 @@ import net.minecraftforge.server.permission.DefaultPermissionLevel; import net.minecraftforge.server.permission.PermissionAPI; -@Mod(modid = "df-roads", useMetadata = true, updateJSON = "https://raw.githubusercontent.com/derfl007/df-roads/master/update.json") +@Mod(modid = "df-roads", useMetadata = true, updateJSON = "https://raw.githubusercontent.com/E-Mans-Application/df-roads/master/update.json") public class Roads { @Instance(Reference.MOD_ID) @@ -67,17 +70,26 @@ public void preInit(FMLPreInitializationEvent event) { MinecraftForge.EVENT_BUS.register(proxy); PacketHandler.init(); RoadTileEntities.register(); + proxy.preInit(); logger = event.getModLog(); } @EventHandler public void init(FMLInitializationEvent event) { - System.out.println("Init"); + + Configuration config = new Configuration(new File("config/df-roads.cfg")); + config.load(); + + boolean generateAsphalt = config.get("general", "generate_asphalt", true).getBoolean(); + config.save(); + NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); proxy.init(); - GameRegistry.registerWorldGenerator(new WorldGenOre(), 0); + if (generateAsphalt) + GameRegistry.registerWorldGenerator(new WorldGenOre(), 0); + RoadCrafting.register(); MinecraftForge.EVENT_BUS.register(new ServerTickHandler()); PermissionAPI.registerNode("dfroads.command.trafficlights", DefaultPermissionLevel.ALL, diff --git a/src/main/java/derfl007/roads/RoadsTab.java b/src/main/java/derfl007/roads/RoadsTab.java index 6ab4596..676726c 100644 --- a/src/main/java/derfl007/roads/RoadsTab.java +++ b/src/main/java/derfl007/roads/RoadsTab.java @@ -1,22 +1,57 @@ package derfl007.roads; +import java.util.Comparator; + +import com.google.common.collect.Ordering; + import derfl007.roads.init.RoadBlocks; +import derfl007.roads.init.RoadItems; +import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +public class RoadsTab extends CreativeTabs implements Comparator { + + public RoadsTab() { + super("tabRoads"); + + } + + @Override + public ItemStack getTabIconItem() { + return new ItemStack(RoadBlocks.road_line[2]); + } + + @Override + public void displayAllRelevantItems(NonNullList items) { + super.displayAllRelevantItems(items); + items.sort(this); + } -public class RoadsTab extends CreativeTabs { + @Override + public int compare(ItemStack o1, ItemStack o2) { + // TODO Auto-generated method stub + Block b1 = Block.getBlockFromItem(o1.getItem()); + Block b2 = Block.getBlockFromItem(o2.getItem()); - public RoadsTab() { - super("tabRoads"); + int i1 = RoadBlocks.RegistrationHandler.BLOCKS.indexOf(b1); + int i2 = RoadBlocks.RegistrationHandler.BLOCKS.indexOf(b2); - } + if (i1 >= 0 && i2 >= 0) { + return i1 - i2; + } + if (i1 >= 0) { + return -1; + } + if (i2 >= 0) { + return 1; + } - @Override - public ItemStack getTabIconItem() - { - return new ItemStack(RoadBlocks.road_line); - } + i1 = RoadItems.RegistrationHandler.ITEMS.indexOf(o1.getItem()); + i2 = RoadItems.RegistrationHandler.ITEMS.indexOf(o2.getItem()); + return i1 - i2; + } } \ No newline at end of file diff --git a/src/main/java/derfl007/roads/SignsTab.java b/src/main/java/derfl007/roads/SignsTab.java index 835850d..f8977f6 100644 --- a/src/main/java/derfl007/roads/SignsTab.java +++ b/src/main/java/derfl007/roads/SignsTab.java @@ -1,18 +1,28 @@ package derfl007.roads; +import com.google.common.collect.Ordering; + import derfl007.roads.init.RoadBlocks; +import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class SignsTab extends CreativeTabs { - public SignsTab() { - super("tabSigns"); - } + public SignsTab() { + super("tabSigns"); + } - @Override - public ItemStack getTabIconItem() { - return new ItemStack(RoadBlocks.road_sign_priority_2); - } + @Override + public ItemStack getTabIconItem() { + return new ItemStack(RoadBlocks.road_sign_priority_2); + } -} + @Override + public void displayAllRelevantItems(NonNullList items) { + super.displayAllRelevantItems(items); + items.sort(Ordering.explicit(RoadBlocks.RegistrationHandler.BLOCKS) + .onResultOf((ItemStack item) -> Block.getBlockFromItem(item.getItem()))); + } +} \ No newline at end of file diff --git a/src/main/java/derfl007/roads/YellowRoadsTab.java b/src/main/java/derfl007/roads/YellowRoadsTab.java index 8a10d97..1a248a8 100644 --- a/src/main/java/derfl007/roads/YellowRoadsTab.java +++ b/src/main/java/derfl007/roads/YellowRoadsTab.java @@ -1,18 +1,41 @@ package derfl007.roads; +import java.util.Comparator; + import derfl007.roads.init.RoadBlocks; +import derfl007.roads.init.RoadItems; +import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +public class YellowRoadsTab extends CreativeTabs implements Comparator { + + public YellowRoadsTab() { + super("tabYellowRoads"); + } + + @Override + public ItemStack getTabIconItem() { + return new ItemStack(RoadBlocks.road_line_yellow[2]); + } + + @Override + public void displayAllRelevantItems(NonNullList items) { + super.displayAllRelevantItems(items); + items.sort(this); + } + + @Override + public int compare(ItemStack o1, ItemStack o2) { + // TODO Auto-generated method stub + Block b1 = Block.getBlockFromItem(o1.getItem()); + Block b2 = Block.getBlockFromItem(o2.getItem()); -public class YellowRoadsTab extends CreativeTabs { + int i1 = RoadBlocks.RegistrationHandler.BLOCKS.indexOf(b1); + int i2 = RoadBlocks.RegistrationHandler.BLOCKS.indexOf(b2); - public YellowRoadsTab() { - super("tabYellowRoads"); - } + return i1 - i2; - @Override - public ItemStack getTabIconItem() - { - return new ItemStack(RoadBlocks.road_line_yellow); - } + } } diff --git a/src/main/java/derfl007/roads/client/renderer/tileentity/TileEntityRoadTownSignRenderer.java b/src/main/java/derfl007/roads/client/renderer/tileentity/TileEntityRoadTownSignRenderer.java index 870f602..04f9508 100644 --- a/src/main/java/derfl007/roads/client/renderer/tileentity/TileEntityRoadTownSignRenderer.java +++ b/src/main/java/derfl007/roads/client/renderer/tileentity/TileEntityRoadTownSignRenderer.java @@ -1,19 +1,19 @@ package derfl007.roads.client.renderer.tileentity; +import java.awt.Color; +import java.util.List; + import derfl007.roads.common.blocks.BlockRoadTownSign; import derfl007.roads.common.tileentities.TileEntityRoadTownSign; +import derfl007.roads.common.util.SignOrientation; import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.client.model.animation.FastTESR; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; -import java.util.List; - @SideOnly(Side.CLIENT) public class TileEntityRoadTownSignRenderer extends FastTESR { @Override @@ -23,12 +23,12 @@ public void renderTileEntityFast(TileEntityRoadTownSign te, double x, double y, // System.out.println("message: "+message); IBlockState state = getWorld().getBlockState(te.getPos()); if(state.getBlock() instanceof BlockRoadTownSign) { - int rotation = state.getValue(BlockRoadTownSign.FACING).getHorizontalIndex(); + int rotation = state.getValue(BlockRoadTownSign.ORIENTATION); GlStateManager.pushMatrix(); { GlStateManager.translate(x, y, z); //set block as origin GlStateManager.translate(0.5, 0.5, 0.5); //translate origin to the middle of the block - GlStateManager.rotate(-90F * rotation, 0, 1, 0); //rotate origin according to block facing + GlStateManager.rotate(SignOrientation.toAngle(rotation), 0, 1, 0); //rotate origin according to block facing GlStateManager.translate(-0.375, 0, 0.1); //translate origin to the left side of the sign and to the correct depth GlStateManager.scale(1, -1, -1); GlStateManager.scale(0.015625F, 0.015625F, 0.015625F); @@ -42,6 +42,7 @@ public void renderTileEntityFast(TileEntityRoadTownSign te, double x, double y, } GlStateManager.popMatrix(); } + } public void drawSplitString(FontRenderer renderer, String str, int x, int y, int wrapWidth, int textColor) diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRedstoneTransmitter.java b/src/main/java/derfl007/roads/common/blocks/BlockRedstoneTransmitter.java new file mode 100644 index 0000000..d184de0 --- /dev/null +++ b/src/main/java/derfl007/roads/common/blocks/BlockRedstoneTransmitter.java @@ -0,0 +1,136 @@ +package derfl007.roads.common.blocks; + +import java.util.Random; + +import javax.annotation.Nullable; + +import derfl007.roads.common.util.BlockStateUtil; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public abstract class BlockRedstoneTransmitter extends Block { + + private int optGetPower(IBlockState state) { + return BlockStateUtil.optGetValue(state, POWER, -1); + } + + protected static final PropertyInteger POWER = PropertyInteger.create("power", 0, 15); + + public BlockRedstoneTransmitter(Material materialIn) { + super(materialIn); + this.setDefaultState(this.blockState.getBaseState().withProperty(POWER, 0)); + } + + @Override + public final boolean canProvidePower(IBlockState state) { + return true; + } + + @Override + public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + return getWeakPower(blockState, blockAccess, pos, side); + } + + @Override + public final int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + int power = optGetPower(blockState); + if (power <= 0) { + return 0; + } + + if (canProvidePowerTo(blockAccess, blockState, pos, side.getOpposite())) { + return power; + } + + return 0; + } + + private int computePower(IBlockState state, World worldIn, BlockPos pos) { + if (worldIn.getBlockState(pos).getBlock() != this) { + return 0; + } + + int power = worldIn.isBlockIndirectlyGettingPowered(pos); + if (power < 2) { + return 0; + } + + return power - 2; + } + + private void checkPowerChange(World worldIn, BlockPos pos, IBlockState state, boolean force) { + if (worldIn.getBlockState(pos).getBlock() != this) { + return; + } + + int power = computePower(state, worldIn, pos); + + if (force || power != optGetPower(state)) { + worldIn.setBlockState(pos, state.withProperty(POWER, power)); + + worldIn.notifyNeighborsOfStateChange(pos, this, false); + } + } + + @Override + public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { + super.onBlockAdded(worldIn, pos, state); + + if (worldIn.isRemote) { + return; + } + checkPowerChange(worldIn, pos, state, true); + + worldIn.scheduleUpdate(pos, this, 20); + } + + @Override + public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { + super.breakBlock(worldIn, pos, state); + + if (worldIn.isRemote) { + return; + } + + checkPowerChange(worldIn, pos, state, true); + + } + + @Override + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { + if (worldIn.isRemote) { + return; + } + checkPowerChange(worldIn, pos, state, false); + } + + @Override + public final boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, + @Nullable EnumFacing side) { + return side != null; + } + + private final boolean canProvidePowerTo(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing side) { + return worldIn.getBlockState(pos.offset(side)).getBlock() instanceof BlockRedstoneTransmitter; + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + return state.withProperty(POWER, Math.max(0, optGetPower(state))); + } + + @Override + public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { + super.updateTick(worldIn, pos, state, rand); + checkPowerChange(worldIn, pos, state, false); + tickRate(worldIn); + worldIn.scheduleUpdate(pos, this, 10); + + } +} diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoad.java b/src/main/java/derfl007/roads/common/blocks/BlockRoad.java index 8f4e6f4..5e1b188 100644 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoad.java +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoad.java @@ -1,46 +1,504 @@ package derfl007.roads.common.blocks; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.function.Function; + +import javax.annotation.Nullable; + +import org.lwjgl.input.Keyboard; + import derfl007.roads.Reference; import derfl007.roads.Roads; +import derfl007.roads.common.items.ItemWrench; +import derfl007.roads.common.util.UnlistedPropertyBoolean; import net.minecraft.block.Block; +import net.minecraft.block.BlockHorizontal; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockFaceShape; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumFacing.Axis; +import net.minecraft.util.EnumHand; +import net.minecraft.util.Mirror; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Rotation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.PropertyFloat; +import net.minecraftforge.fml.common.registry.GameRegistry; + +public class BlockRoad extends BlockHorizontal { + + @Override + public void addInformation(ItemStack stack, World player, List tooltip, ITooltipFlag advanced) { + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + tooltip.add(I18n.format("block.road_rotatable.tooltip")); + } else { + tooltip.add(I18n.format("gui.tooltip.view_more")); + } + } + + public class RoadItemBlock extends ItemBlock { + public RoadItemBlock() { + super(BlockRoad.this); + } + + @Override + public String getItemStackDisplayName(ItemStack stack) { + return super.getItemStackDisplayName(stack) + " " + + getLocalizedString("dfroads.partial.road_height", BlockRoad.this.getHeight()); + } + + private String getLocalizedString(String translationKey, Object... args) { + return new TextComponentTranslation(translationKey, args).getFormattedText(); + } + + } + + public RoadItemBlock createItemBlock() { + return new RoadItemBlock(); + } + + private static final double HEIGHT_0 = 0.25; + private static final double HEIGHT_1 = 0.5; + private static final double HEIGHT_2 = 0.75; + private static final double HEIGHT_3 = 1; + + public static Set getRegisteredTextures() { + return Collections.unmodifiableSet(REGISTERED_TEXTURES); + } + + public static Set getRegisteredBlocks() { + return Collections.unmodifiableSet(REGISTERED_BLOCKS); + } + + /** + * Make sure you call it on the correct BlockRoad instance. + * + * @return + */ + public double getHeight() { + switch (blockHeight) { + case 0: + return HEIGHT_0; + case 1: + return HEIGHT_1; + case 2: + return HEIGHT_2; + default: + return HEIGHT_3; + } + } + + private static final AxisAlignedBB BB_HEIGHT_0 = new AxisAlignedBB(0, 0, 0, 1, HEIGHT_0, 1); + private static final AxisAlignedBB BB_HEIGHT_1 = new AxisAlignedBB(0, 0, 0, 1, HEIGHT_1, 1); + private static final AxisAlignedBB BB_HEIGHT_2 = new AxisAlignedBB(0, 0, 0, 1, HEIGHT_2, 1); + private static final AxisAlignedBB BB_HEIGHT_3 = new AxisAlignedBB(0, 0, 0, 1, HEIGHT_3, 1); + + private final int blockHeight; + private final String texturePath; + protected final String baseName; + + private static final Set REGISTERED_BLOCKS = new HashSet<>(); + private static final Set REGISTERED_TEXTURES = new HashSet<>(); + + public static final PropertyDirection TEXTURE_ROTATION = PropertyDirection.create("slope_facing", + EnumFacing.Plane.HORIZONTAL); + + public static final PropertyFloat HEIGHT = new PropertyFloat("height", 0F, 1F); + public static final UnlistedPropertyBoolean SLOPE = new UnlistedPropertyBoolean("slope"); + public static final PropertyFloat SLOPE_BOTTOM = new PropertyFloat("bottom", -0.75F, 0.75F); + + protected BlockRoad(String name, String texture, int height, boolean yellow, boolean register) { + super(Material.ROCK); + this.setUnlocalizedName(name); + + this.baseName = name; + + String registryName = name; + if (height != 2) { + registryName += "_" + String.valueOf(height); + } + + this.setRegistryName(registryName); + if (yellow) { + this.setCreativeTab(Roads.YELLOW_ROADS_TAB); + } else { + this.setCreativeTab(Roads.ROADS_TAB); + } + this.setHardness(1.5F); + + if (height < 0 || height > 3) { + throw new IllegalArgumentException(); + } + + blockHeight = height; + texturePath = texture; + + if (register) { + REGISTERED_TEXTURES.add(texture); + REGISTERED_BLOCKS.add(registryName); + } + + // TODO Auto-generated constructor stub + } + + protected void registerTexture(String texture) { + REGISTERED_TEXTURES.add(texture); + } + + public static void registerRecipes(Block[] blocks) { + + // Reduce height + + // three 3/4 = nine 1/4 + ResourceLocation recipeName = new ResourceLocation(Reference.MOD_ID, + blocks[0].getRegistryName().getResourcePath() + "_0"); + GameRegistry.addShapedRecipe(recipeName, null, new ItemStack(blocks[0], 9), "XXX", 'X', blocks[2]); + + // two 1/2 = four 1/4 + recipeName = new ResourceLocation(Reference.MOD_ID, blocks[0].getRegistryName().getResourcePath() + "_1"); + GameRegistry.addShapedRecipe(recipeName, null, new ItemStack(blocks[0], 4), "XX", 'X', blocks[1]); + + // two 1 = four 1/2 + recipeName = new ResourceLocation(Reference.MOD_ID, blocks[1].getRegistryName().getResourcePath() + "_0"); + GameRegistry.addShapedRecipe(recipeName, null, new ItemStack(blocks[1], 4), "XX", 'X', blocks[3]); + + // Increase height + + // two 1/4 = one 1/2 + recipeName = new ResourceLocation(Reference.MOD_ID, blocks[1].getRegistryName().getResourcePath() + "_1"); + GameRegistry.addShapedRecipe(recipeName, null, new ItemStack(blocks[1]), "X", "X", 'X', blocks[0]); + + // three 1/4 = one 3/4 + recipeName = new ResourceLocation(Reference.MOD_ID, blocks[2].getRegistryName().getResourcePath() + "_1"); + GameRegistry.addShapedRecipe(recipeName, null, new ItemStack(blocks[2]), "X", "X", "X", 'X', blocks[0]); + + // two 1/2 = one 1 + recipeName = new ResourceLocation(Reference.MOD_ID, blocks[3].getRegistryName().getResourcePath()); + GameRegistry.addShapedRecipe(recipeName, null, new ItemStack(blocks[3]), "X", "X", 'X', blocks[1]); + } + + private static Block[] create(String name, String texture, boolean yellow) { + return new Block[] { new BlockRoad(name, texture, 0, yellow, true), + new BlockRoad(name, texture, 1, yellow, true), new BlockRoad(name, texture, 2, yellow, true), + new BlockRoad(name, texture, 3, yellow, true) }; + } + + public static Block[] create(String name, String texture) { + return create(name, texture, false); + } + + public static Block[] createYellow(String name, String texture) { + return create(name, texture, true); + } + + public static Block[] create(String name) { + return create(name, name, false); + } + + public static Block[] createYellow(String name) { + return create(name, name, true); + } + + protected final String getTexturePath() { + return texturePath; + } + + protected final TextureAtlasSprite getTexture(String name, + Function textureGetter) { + return textureGetter.apply(new ResourceLocation(Reference.MOD_ID, "blocks/" + name)); + } + + // state is used by subclasses in overridden methods + public TextureAtlasSprite getTextureSprite(@Nullable IBlockState state, + Function textureGetter) { + return getTexture(this.texturePath, textureGetter); + } + + @Override + public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, + float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { + IBlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); + + EnumFacing blockFacing = placer.getHorizontalFacing().getOpposite(); + + state = state.withProperty(FACING, blockFacing); + + return state; + } + + @Override + public final boolean isFullCube(IBlockState state) { + return false; + } + + @Override + public final boolean isFullBlock(IBlockState state) { + return false; + } + + @Override + public final boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return getBoxFromState((IExtendedBlockState) state, source, pos); + } + + private AxisAlignedBB getBoxFromState(IExtendedBlockState state, IBlockAccess world, BlockPos pos) { + + AxisAlignedBB bb; + + switch (blockHeight) { + case 0: + bb = BB_HEIGHT_0; + break; + case 1: + bb = BB_HEIGHT_1; + break; + case 2: + bb = BB_HEIGHT_2; + break; + case 3: + bb = BB_HEIGHT_3; + break; + default: + return FULL_BLOCK_AABB; + } + + SlopeState slope = shouldBeSlope(world, state, pos); + if (slope.isSlope() && slope.getBottomPosition() < 0D) { + bb = bb.expand(0, slope.getBottomPosition(), 0); + } + + return bb; + + } + + @Override + public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, + List collidingBoxes, Entity entityIn, boolean isActualState) { + SlopeState slope = shouldBeSlope(worldIn, state, pos); + float height = (float) getHeight(); + + if (slope.isSlope()) { + EnumFacing facing = state.getValue(FACING); + + if (facing.getAxis() == Axis.X) { // EAST or WEST + for (int i = 0; i <= 9; i++) { + double x1 = i / 10D; + double x2 = (i + 1) / 10D; + + addCollisionBoxToList(pos, entityBox, collidingBoxes, + new AxisAlignedBB(x1, slope.getBottomPosition(), 0, x2, getHeightAtPosition(facing, height, + slope.isSlope(), slope.getBottomPosition(), (x1 + x2) / 2D, 0), 1)); + } + } + if (facing.getAxis() == Axis.Z) { // SOUTH or NORTH + for (int i = 0; i <= 9; i++) { + double z1 = i / 10D; + double z2 = (i + 1) / 10D; + + addCollisionBoxToList(pos, entityBox, collidingBoxes, + new AxisAlignedBB(0, slope.getBottomPosition(), z1, 1, getHeightAtPosition(facing, height, + slope.isSlope(), slope.getBottomPosition(), 0, (z1 + z2) / 2D), z2)); + } + } + + } else { + addCollisionBoxToList(pos, entityBox, collidingBoxes, + getBoxFromState((IExtendedBlockState) state, worldIn, pos)); + } + } + + protected static class SlopeState { + private final boolean slope; + private final float slopeBottom; + + private final EnumFacing facing; + + private final BlockRoad block; + + public boolean isSlope() { + return slope; + } + + public float getBottomPosition() { + if (slope) { + return slopeBottom; + } + return 0F; + } + + public EnumFacing getFacing() { + if (!slope) { + throw new IllegalStateException("Not a slope"); + } + return facing; + } + + public BlockRoad getBlock() { + return block; + } + + public SlopeState(BlockRoad block, EnumFacing facing, boolean slope, float slopeBottom) { + this.block = block; + this.facing = facing; + this.slope = slope; + this.slopeBottom = slopeBottom; + } + + @Override + public boolean equals(Object other) { + if (other instanceof SlopeState) { + SlopeState slope = (SlopeState) other; + + if (!slope.slope && !this.slope) { + return slope.block.getHeight() == block.getHeight(); + } + + return slope.facing == facing && slope.slope == this.slope && slope.slopeBottom == slopeBottom + && slope.block.getHeight() == block.getHeight(); + } + return super.equals(other); + } + } + + protected static SlopeState shouldBeSlope(IBlockAccess worldIn, IBlockState state, BlockPos pos) { + Block block_under = worldIn.getBlockState(pos.offset(EnumFacing.DOWN)).getBlock(); + Block block_facing = worldIn.getBlockState(pos.offset(state.getValue(FACING))).getBlock(); + + double height = ((BlockRoad) state.getBlock()).getHeight(); + + if (block_facing instanceof BlockRoad && ((BlockRoad) block_facing).getHeight() < height) { + return new SlopeState((BlockRoad) state.getBlock(), state.getValue(FACING), true, + (float) ((BlockRoad) block_facing).getHeight()); + } + if (block_under instanceof BlockRoad && height <= ((BlockRoad) block_under).getHeight()) { + return new SlopeState((BlockRoad) state.getBlock(), state.getValue(FACING), true, + (float) ((BlockRoad) block_under).getHeight() - 1); + } + return new SlopeState((BlockRoad) state.getBlock(), state.getValue(FACING), false, 0F); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + int facing = meta / 4; + int slopeFacing = meta % 4; + + return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(facing)) + .withProperty(TEXTURE_ROTATION, EnumFacing.getHorizontal(slopeFacing)); + + } + + @Override + public int getMetaFromState(IBlockState state) { + int facing = state.getValue(FACING).getHorizontalIndex(); + int slopeFacing = state.getValue(TEXTURE_ROTATION).getHorizontalIndex(); + return 4 * facing + slopeFacing; + + } + + @Override + public IBlockState withRotation(IBlockState state, Rotation rot) { + return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); + } + + @Override + public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { + return state.withRotation(mirrorIn.toRotation(state.getValue(FACING))); + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer.Builder(this).add(FACING, TEXTURE_ROTATION).add(SLOPE, SLOPE_BOTTOM, HEIGHT) + .build(); + } + + @Override + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, + EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + if (worldIn.isRemote) { + return true; + } + + if (playerIn.getHeldItem(EnumHand.MAIN_HAND).getItem() instanceof ItemWrench) { + EnumFacing slopeFacing = state.getValue(TEXTURE_ROTATION); + + worldIn.setBlockState(pos, state.withProperty(TEXTURE_ROTATION, slopeFacing.rotateY())); + return true; + + } + + return false; + } + + public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { + return face == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; + } + + @Override + public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + + state = super.getExtendedState(state, worldIn, pos); + + SlopeState slope = shouldBeSlope(worldIn, state, pos); + + return ((IExtendedBlockState) state).withProperty(SLOPE, slope.isSlope()) + .withProperty(SLOPE_BOTTOM, slope.isSlope() ? slope.getBottomPosition() : 0F) + .withProperty(HEIGHT, (float) getHeight()); + } + + public double getHeightAtPosition(EnumFacing facing, float height, boolean slope, float slopeBottom, double x, + double z) { + + if (slope) { + + double baseHeight = slopeBottom; + if (facing == EnumFacing.NORTH) { + baseHeight += z * (height - slopeBottom); + } + if (facing == EnumFacing.SOUTH) { + baseHeight += (1 - z) * (height - slopeBottom); + } + if (facing == EnumFacing.EAST) { + baseHeight += (1 - x) * (height - slopeBottom); + } + if (facing == EnumFacing.WEST) { + baseHeight += x * (height - slopeBottom); + } + + return baseHeight; + } else { + return height; + } + + } -public class BlockRoad extends Block { - public BlockRoad(String name) { - super(Material.ROCK); - this.setRegistryName(name); - this.setUnlocalizedName(name); - this.setCreativeTab(Roads.ROADS_TAB); - this.setHardness(1.5F); - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public boolean isFullBlock(IBlockState state) { - return false; - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { - return Reference.ROAD_BLOCK_AABB; - } - - public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { - return face == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; - } } diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadGuardrail.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadGuardrail.java index ff4cbb9..f898fff 100644 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoadGuardrail.java +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadGuardrail.java @@ -2,7 +2,6 @@ import derfl007.roads.Roads; import derfl007.roads.init.RoadBlocks; -import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.BlockStairs; import net.minecraft.block.material.Material; @@ -12,7 +11,11 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.*; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadLantern.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadLantern.java index 534711c..6edd987 100644 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoadLantern.java +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadLantern.java @@ -1,5 +1,7 @@ package derfl007.roads.common.blocks; +import java.util.Random; + import derfl007.roads.Reference; import derfl007.roads.Roads; import derfl007.roads.common.tileentities.TileEntityRoadLantern; @@ -26,8 +28,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.Random; - public class BlockRoadLantern extends Block { private final boolean isOn; diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadLine.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadLine.java index abda235..cff1b57 100644 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoadLine.java +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadLine.java @@ -1,167 +1,356 @@ package derfl007.roads.common.blocks; -import derfl007.roads.Reference; -import derfl007.roads.Roads; + +import java.util.List; +import java.util.function.Function; + +import javax.annotation.Nullable; + +import org.lwjgl.input.Keyboard; + +import derfl007.roads.common.util.UnlistedPropertyBoolean; import derfl007.roads.init.RoadBlocks; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.Mirror; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.Rotation; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.property.IExtendedBlockState; + +public class BlockRoadLine extends BlockRoad { + + private final boolean yellow; + + public boolean isYellow() { + return yellow; + } + + public static final UnlistedPropertyBoolean NORTH = new UnlistedPropertyBoolean("north"); + public static final UnlistedPropertyBoolean EAST = new UnlistedPropertyBoolean("east"); + public static final UnlistedPropertyBoolean SOUTH = new UnlistedPropertyBoolean("south"); + public static final UnlistedPropertyBoolean WEST = new UnlistedPropertyBoolean("west"); + + @Override + public void addInformation(ItemStack stack, World player, List tooltip, ITooltipFlag advanced) { + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + tooltip.add(I18n.format("block.road_lines.tooltip")); + } else { + tooltip.add(I18n.format("gui.tooltip.view_more")); + } + } + + private static Block[] create(String name, String texture, boolean yellow) { + return new Block[] { new BlockRoadLine(name, texture, 0, yellow), new BlockRoadLine(name, texture, 1, yellow), + new BlockRoadLine(name, texture, 2, yellow), new BlockRoadLine(name, texture, 3, yellow) }; + } + + public static Block[] create() { + return create("road_line", "road", false); + } + + public static Block[] createYellow() { + return create("road_line_yellow", "road", true); + } + + /** + * @deprecated Call from BlockRoad. + * @param name + * @param texture + * @return + */ + @Deprecated + public static Block[] create(String name, String texture) { + return BlockRoad.create(name, texture); + } + + /** + * @deprecated Call from BlockRoad. + * @param name + * @param texture + * @return + */ + @Deprecated + public static Block[] create(String name) { + return BlockRoad.create(name); + } + + /** + * @deprecated Call from BlockRoad. + * @param name + * @param texture + * @return + */ + @Deprecated + public static Block[] createYellow(String name, String texture) { + return BlockRoad.createYellow(name, texture); + } + + /** + * @deprecated Call from BlockRoad. + * @param name + * @param texture + * @return + */ + @Deprecated + public static Block[] createYellow(String name) { + return BlockRoad.createYellow(name); + } + + protected BlockRoadLine(String name, String texture, int height, boolean yellow) { + super(name, texture, height, yellow, false); + + this.yellow = yellow; + } + + @Override + public TextureAtlasSprite getTextureSprite(@Nullable IBlockState state, + Function textureGetter) { + if (state == null) { // rendered as item + if (yellow) { + return getTexture("road_line_single_yellow", textureGetter); + } else { + return getTexture("road_line_single", textureGetter); + } + } + return super.getTextureSprite(state, textureGetter); + } + + private boolean canConnectTo(SlopeState block) { + if (block == null) { + return false; + } + for (connectableBlocks b : connectableBlocks.values()) { + for (Block bl : b.blocks()) { + if (bl.equals(block.getBlock())) { + return true; + } + } + } + return false; + } + + public enum connectableBlocks { + ROAD_LINE(RoadBlocks.road_line), ROAD_LINE_SIMPLE(RoadBlocks.road_line_simple), + ROAD_LINE_MERGE(RoadBlocks.road_line_merge), ROAD_LINE_DIAGONAL(RoadBlocks.road_line_diagonal), + ROAD_WHITE_QUARTER(RoadBlocks.road_white_quarter), ROAD_WHITE_HALF(RoadBlocks.road_white_half), + ROAD_EXCL_ZONE_SPLIT_IN_L(RoadBlocks.road_excl_zone_split_in_l), + ROAD_EXCL_ZONE_SPLIT_IN_R(RoadBlocks.road_excl_zone_split_in_r), + ROAD_EXCL_ZONE_SPLIT_OUT_L(RoadBlocks.road_excl_zone_split_out_l), + ROAD_EXCL_ZONE_SPLIT_OUT_R(RoadBlocks.road_excl_zone_split_out_r), + ROAD_LINE_YELLOW(RoadBlocks.road_line_yellow), ROAD_LINE_SIMPLE_YELLOW(RoadBlocks.road_line_simple_yellow), + ROAD_LINE_MERGE_YELLOW(RoadBlocks.road_line_merge_yellow), + ROAD_LINE_DIAGONAL_YELLOW(RoadBlocks.road_line_diagonal_yellow), + ROAD_WHITE_QUARTER_YELLOW(RoadBlocks.road_white_quarter_yellow), + ROAD_WHITE_HALF_YELLOW(RoadBlocks.road_white_half_yellow), + ROAD_EXCL_ZONE_SPLIT_IN_L_YELLOW(RoadBlocks.road_excl_zone_split_in_l_yellow), + ROAD_EXCL_ZONE_SPLIT_IN_R_YELLOW(RoadBlocks.road_excl_zone_split_in_r_yellow), + ROAD_EXCL_ZONE_SPLIT_OUT_L_YELLOW(RoadBlocks.road_excl_zone_split_out_l_yellow), + ROAD_EXCL_ZONE_SPLIT_OUT_R_YELLOW(RoadBlocks.road_excl_zone_split_out_r_yellow); + + private final Block[] blocks; + + connectableBlocks(Block... block) { + this.blocks = block; + } + + private Block[] blocks() { + return blocks; + } + + public String getName() { + return blocks()[0].toString(); + } + } + + /** + * Get the actual Block state of this Block at the given position. This applies + * properties not visible in the metadata, such as fence connections. + */ + @Override + public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + + IExtendedBlockState extendedState = super.getExtendedState(state, worldIn, pos); + + return (IExtendedBlockState) extendedState + .withProperty(NORTH, canConnectInDirection(worldIn, extendedState, pos, EnumFacing.NORTH)) + .withProperty(EAST, canConnectInDirection(worldIn, extendedState, pos, EnumFacing.EAST)) + .withProperty(SOUTH, canConnectInDirection(worldIn, extendedState, pos, EnumFacing.SOUTH)) + .withProperty(WEST, canConnectInDirection(worldIn, extendedState, pos, EnumFacing.WEST)) + .withProperty(TEXTURE_ROTATION, EnumFacing.SOUTH); // TEXTURE_ROTATION set to avoid exceptions, but + // unused + } + + private SlopeState getSlopeState(IBlockAccess worldIn, BlockPos pos) { + IBlockState state = worldIn.getBlockState(pos); + if (state.getBlock() instanceof BlockRoad) { + return shouldBeSlope(worldIn, state, pos); + } + return null; + } + + private boolean canConnectInDirection(IBlockAccess worldIn, IExtendedBlockState state, BlockPos pos, + EnumFacing direction) { + + SlopeState slope = shouldBeSlope(worldIn, state, pos); + + BlockPos testNeighbor = pos.offset(direction).up(); + SlopeState testState = getSlopeState(worldIn, testNeighbor); + if (canConnectTo(testState) && getHeight() == 1 + testState.getBottomPosition()) { + return testState.isSlope() && testState.getFacing() == direction.getOpposite() + && (!slope.isSlope() || slope.getFacing() == testState.getFacing()); + } + + testNeighbor = pos.offset(direction); + testState = getSlopeState(worldIn, testNeighbor); + if (canConnectTo(testState)) { + + if (slope.isSlope()) { + if (direction == slope.getFacing()) { // bottom of the slope + if (testState.getBlock().getHeight() == slope.getBottomPosition()) { + // slope stops or continues + return !testState.isSlope() || testState.getFacing() == slope.getFacing(); + } else if (testState.getBottomPosition() == slope.getBottomPosition()) { + // slope inverts + return testState.isSlope() && testState.getFacing() == slope.getFacing().getOpposite(); + } else { + return false; + } + } else if (direction == slope.getFacing().getOpposite()) { // top of the slope + if (testState.getBlock().getHeight() == getHeight()) { + // slope stops or inverts + return !testState.isSlope() || testState.getFacing() == slope.getFacing().getOpposite(); + } else if (testState.getBottomPosition() == getHeight()) { + // slope continues + return testState.isSlope() && testState.getFacing() == slope.getFacing(); + } else { + return false; + } + } else { + return slope.equals(testState); // sides of the slope + } + } else { + System.out.println("bottom" + String.valueOf(testState.getBottomPosition())); + System.out.println("height" + String.valueOf(getHeight())); + System.out.println("direction" + direction); + if (testState.isSlope()) { + System.out.println("facing" + testState.getFacing()); + } + if (testState.isSlope() && testState.getFacing() != direction) { + if (testState.getFacing() == direction.getOpposite()) { + return testState.getBottomPosition() == getHeight(); + } else { + return false; + } + } else { + return testState.getBlock().getHeight() == getHeight(); + } + } + + } + + if (slope.isSlope() && slope.getFacing() == direction) { + testNeighbor = pos.offset(direction).down(); + testState = getSlopeState(worldIn, testNeighbor); + if (canConnectTo(testState)) { + if (testState.isSlope() && testState.getFacing() != direction) { + return false; + } + return testState.getBlock().getHeight() == 1 + slope.getBottomPosition(); + } + } + + return false; + } + + /** + * Returns the blockstate with the given rotation from the passed blockstate. If + * inapplicable, returns the passed blockstate. + */ + @Override + public IBlockState withRotation(IBlockState state, Rotation rot) { + if (!(state instanceof IExtendedBlockState)) { + return state; + } + IExtendedBlockState extendedState = (IExtendedBlockState) state; + + switch (rot) { + case CLOCKWISE_180: + return extendedState.withProperty(NORTH, extendedState.getValue(SOUTH)) + .withProperty(EAST, extendedState.getValue(WEST)).withProperty(SOUTH, extendedState.getValue(NORTH)) + .withProperty(WEST, extendedState.getValue(EAST)); + case COUNTERCLOCKWISE_90: + return extendedState.withProperty(NORTH, extendedState.getValue(EAST)) + .withProperty(EAST, extendedState.getValue(SOUTH)).withProperty(SOUTH, extendedState.getValue(WEST)) + .withProperty(WEST, extendedState.getValue(NORTH)); + case CLOCKWISE_90: + return extendedState.withProperty(NORTH, extendedState.getValue(WEST)) + .withProperty(EAST, extendedState.getValue(NORTH)).withProperty(SOUTH, extendedState.getValue(EAST)) + .withProperty(WEST, extendedState.getValue(SOUTH)); + default: + return state; + } + } + + /** + * Returns the blockstate with the given mirror of the passed blockstate. If + * inapplicable, returns the passed blockstate. + */ + @SuppressWarnings("deprecation") + @Override + public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { + if (!(state instanceof IExtendedBlockState)) { + return state; + } + IExtendedBlockState extendedState = (IExtendedBlockState) state; + + switch (mirrorIn) { + case LEFT_RIGHT: + return extendedState.withProperty(NORTH, extendedState.getValue(SOUTH)).withProperty(SOUTH, + extendedState.getValue(NORTH)); + case FRONT_BACK: + return extendedState.withProperty(EAST, extendedState.getValue(WEST)).withProperty(WEST, + extendedState.getValue(EAST)); + default: + return super.withMirror(state, mirrorIn); + } + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer.Builder(this).add(FACING, TEXTURE_ROTATION) + .add(SLOPE, SLOPE_BOTTOM, HEIGHT, NORTH, EAST, WEST, SOUTH).build(); + } + + @Override + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, + EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + return false; + + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(FACING).getHorizontalIndex(); + } + + /* + * @Override public boolean shouldSideBeRendered(IBlockState blockState, + * IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { return true; } + */ -public class BlockRoadLine extends Block { - private static final PropertyBool NORTH = PropertyBool.create("north"); - private static final PropertyBool EAST = PropertyBool.create("east"); - private static final PropertyBool SOUTH = PropertyBool.create("south"); - private static final PropertyBool WEST = PropertyBool.create("west"); - - public BlockRoadLine(String name) { - super(Material.ROCK); - this.setRegistryName(name); - this.setUnlocalizedName(name); - this.setDefaultState(this.blockState.getBaseState().withProperty(NORTH, false) - .withProperty(EAST, false).withProperty(SOUTH, false) - .withProperty(WEST, false)); - this.setCreativeTab(Roads.ROADS_TAB); - this.setHardness(1.5F); - } - - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { - return Reference.ROAD_BLOCK_AABB; - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { - IBlockState iblockstate = worldIn.getBlockState(pos); - Block block = iblockstate.getBlock(); - - for (connectableBlocks b : connectableBlocks.values()) { - if (b.block().equals(block)) { - return true; - } - } - return false; - } - - /** - * Convert the BlockState into the correct metadata value - */ - @Override - public int getMetaFromState(IBlockState state) { - return 0; - } - - public enum connectableBlocks { - ROAD_LINE(RoadBlocks.road_line), - ROAD_LINE_SIMPLE(RoadBlocks.road_line_simple), - ROAD_LINE_MERGE(RoadBlocks.road_line_merge), - ROAD_LINE_DIAGONAL(RoadBlocks.road_line_diagonal), - ROAD_WHITE_QUARTER(RoadBlocks.road_white_quarter), - ROAD_WHITE_HALF(RoadBlocks.road_white_half), - ROAD_EXCL_ZONE_SPLIT_IN_L(RoadBlocks.road_excl_zone_split_in_l), - ROAD_EXCL_ZONE_SPLIT_IN_R(RoadBlocks.road_excl_zone_split_in_r), - ROAD_EXCL_ZONE_SPLIT_OUT_L(RoadBlocks.road_excl_zone_split_out_l), - ROAD_EXCL_ZONE_SPLIT_OUT_R(RoadBlocks.road_excl_zone_split_out_r), - ROAD_LINE_YELLOW(RoadBlocks.road_line_yellow), - ROAD_LINE_SIMPLE_YELLOW(RoadBlocks.road_line_simple_yellow), - ROAD_LINE_MERGE_YELLOW(RoadBlocks.road_line_merge_yellow), - ROAD_LINE_DIAGONAL_YELLOW(RoadBlocks.road_line_diagonal_yellow), - ROAD_WHITE_QUARTER_YELLOW(RoadBlocks.road_white_quarter_yellow), - ROAD_WHITE_HALF_YELLOW(RoadBlocks.road_white_half_yellow), - ROAD_EXCL_ZONE_SPLIT_IN_L_YELLOW(RoadBlocks.road_excl_zone_split_in_l_yellow), - ROAD_EXCL_ZONE_SPLIT_IN_R_YELLOW(RoadBlocks.road_excl_zone_split_in_r_yellow), - ROAD_EXCL_ZONE_SPLIT_OUT_L_YELLOW(RoadBlocks.road_excl_zone_split_out_l_yellow), - ROAD_EXCL_ZONE_SPLIT_OUT_R_YELLOW(RoadBlocks.road_excl_zone_split_out_r_yellow); - - private final Block block; - - connectableBlocks(Block block) { - this.block = block; - } - - private Block block() { - return block; - } - - public String getName() { - return block().toString(); - } - } - - /** - * Get the actual Block state of this Block at the given position. This - * applies properties not visible in the metadata, such as fence - * connections. - */ - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return state.withProperty(NORTH, this.canConnectTo(worldIn, pos.north())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.east())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.south())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.west())); - } - - /** - * Returns the blockstate with the given rotation from the passed - * blockstate. If inapplicable, returns the passed blockstate. - */ - @Override - public IBlockState withRotation(IBlockState state, Rotation rot) { - switch (rot) { - case CLOCKWISE_180: - return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(EAST, state.getValue(WEST)) - .withProperty(SOUTH, state.getValue(NORTH)).withProperty(WEST, state.getValue(EAST)); - case COUNTERCLOCKWISE_90: - return state.withProperty(NORTH, state.getValue(EAST)).withProperty(EAST, state.getValue(SOUTH)) - .withProperty(SOUTH, state.getValue(WEST)).withProperty(WEST, state.getValue(NORTH)); - case CLOCKWISE_90: - return state.withProperty(NORTH, state.getValue(WEST)).withProperty(EAST, state.getValue(NORTH)) - .withProperty(SOUTH, state.getValue(EAST)).withProperty(WEST, state.getValue(SOUTH)); - default: - return state; - } - } - - /** - * Returns the blockstate with the given mirror of the passed blockstate. If - * inapplicable, returns the passed blockstate. - */ - @SuppressWarnings("deprecation") - @Override - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { - switch (mirrorIn) { - case LEFT_RIGHT: - return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(SOUTH, state.getValue(NORTH)); - case FRONT_BACK: - return state.withProperty(EAST, state.getValue(WEST)).withProperty(WEST, state.getValue(EAST)); - default: - return super.withMirror(state, mirrorIn); - } - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, NORTH, EAST, WEST, SOUTH); - } - - public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { - return face == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; - } } \ No newline at end of file diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadLines.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadLines.java index 5281a08..8acaa71 100644 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoadLines.java +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadLines.java @@ -1,17 +1,18 @@ package derfl007.roads.common.blocks; -import derfl007.roads.Reference; -import derfl007.roads.Roads; -import derfl007.roads.common.items.ItemWrench; +import java.util.List; +import java.util.function.Function; + +import javax.annotation.Nullable; + +import org.lwjgl.input.Keyboard; + +import derfl007.roads.common.util.UnlistedPropertyEnum; import net.minecraft.block.Block; -import net.minecraft.block.BlockHorizontal; import net.minecraft.block.BlockStairs; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; @@ -20,187 +21,238 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.Mirror; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.Rotation; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.lwjgl.input.Keyboard; - -import java.util.List; +import net.minecraftforge.common.property.IExtendedBlockState; @SuppressWarnings("Duplicates") -public class BlockRoadLines extends Block { - public BlockRoadLines(String name) { - super(Material.ROCK); - this.setRegistryName(name); - this.setUnlocalizedName(name); - this.setCreativeTab(Roads.ROADS_TAB); - this.setHardness(1.5F); - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - private static final AxisAlignedBB AABB_QTR_TOP_WEST = new AxisAlignedBB(0.0D, 0.3125D, 0.0D, 0.5D, 0.8125D, 1.0D); - private static final AxisAlignedBB AABB_QTR_TOP_EAST = new AxisAlignedBB(0.5D, 0.3125D, 0.0D, 1.0D, 0.8125D, 1.0D); - private static final AxisAlignedBB AABB_QTR_TOP_NORTH = new AxisAlignedBB(0.0D, 0.3125D, 0.0D, 1.0D, 0.8125D, 0.5D); - private static final AxisAlignedBB AABB_QTR_TOP_SOUTH = new AxisAlignedBB(0.0D, 0.3125D, 0.5D, 1.0D, 0.8125D, 1.0D); - private static final AxisAlignedBB AABB_SLAB_BOTTOM = new AxisAlignedBB(0.0D, -0.1875D, 0.0D, 1.0D, 0.3125D, 1.0D); - - private static final PropertyDirection FACING = BlockHorizontal.FACING; - private static final PropertyEnum SHAPE = PropertyEnum.create("shape", BlockStairs.EnumShape.class); - - @Override - public void addInformation(ItemStack stack, World player, List tooltip, ITooltipFlag advanced) { - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { - tooltip.add(I18n.format("block.road_lines.tooltip")); - } else { - tooltip.add(I18n.format("gui.tooltip.view_more")); - } - } - - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { - return Reference.ROAD_BLOCK_AABB; - } - - @Override - public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { - IBlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); - state = state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(SHAPE, BlockStairs.EnumShape.STRAIGHT); - return state; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta)); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(FACING).getHorizontalIndex(); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return state.withProperty(SHAPE, getShape(state, worldIn, pos)); - } - - public static BlockStairs.EnumShape getShape(IBlockState state, IBlockAccess worldIn, - BlockPos pos) { - EnumFacing enumfacing = state.getValue(FACING); - IBlockState iblockstate = worldIn.getBlockState(pos.offset(enumfacing.rotateYCCW())); - Block blockcurrent = worldIn.getBlockState(pos).getBlock(); - - if (iblockstate.getBlock() == blockcurrent) { - EnumFacing enumfacing1 = iblockstate.getValue(FACING); - - if (enumfacing1.getAxis() != state.getValue(FACING).getAxis()) { - if (enumfacing1 == enumfacing.rotateYCCW()) { - return BlockStairs.EnumShape.OUTER_LEFT; - } - - return BlockStairs.EnumShape.OUTER_RIGHT; - } - } - - IBlockState iblockstate1 = worldIn.getBlockState(pos.offset(enumfacing.rotateYCCW().getOpposite())); - - if (iblockstate1.getBlock() == blockcurrent) { - EnumFacing enumfacing2 = iblockstate1.getValue(FACING); - - if (enumfacing2.getAxis() != state.getValue(FACING).getAxis()) { - if (enumfacing2 == enumfacing.rotateYCCW()) { - return BlockStairs.EnumShape.INNER_LEFT; - } - - return BlockStairs.EnumShape.INNER_RIGHT; - } - } - - return BlockStairs.EnumShape.STRAIGHT; - } - - @Override - @SuppressWarnings({ "incomplete-switch", "deprecation" }) - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { - EnumFacing enumfacing = state.getValue(FACING); - BlockStairs.EnumShape blockstairs$enumshape = state.getValue(SHAPE); - - switch (mirrorIn) { - case LEFT_RIGHT: - - if (enumfacing.getAxis() == EnumFacing.Axis.Z) { - switch (blockstairs$enumshape) { - case OUTER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(SHAPE, - BlockStairs.EnumShape.OUTER_RIGHT); - case OUTER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(SHAPE, - BlockStairs.EnumShape.OUTER_LEFT); - case INNER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(SHAPE, - BlockStairs.EnumShape.INNER_LEFT); - case INNER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(SHAPE, - BlockStairs.EnumShape.INNER_RIGHT); - default: - return state.withRotation(Rotation.CLOCKWISE_180); - } - } - - break; - case FRONT_BACK: - - if (enumfacing.getAxis() == EnumFacing.Axis.X) { - switch (blockstairs$enumshape) { - case OUTER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(SHAPE, - BlockStairs.EnumShape.OUTER_RIGHT); - case OUTER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(SHAPE, - BlockStairs.EnumShape.OUTER_LEFT); - case INNER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(SHAPE, - BlockStairs.EnumShape.INNER_RIGHT); - case INNER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(SHAPE, - BlockStairs.EnumShape.INNER_LEFT); - case STRAIGHT: - return state.withRotation(Rotation.CLOCKWISE_180); - } - } - } - - return super.withMirror(state, mirrorIn); - } - - @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if(worldIn.isRemote) { - return false; - } - if(playerIn.getHeldItem(hand).getItem() == new ItemWrench()) { - - } - - return false; - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, FACING, SHAPE); - } - - public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { - return face == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; - } +public class BlockRoadLines extends BlockRoad { + + private final boolean yellow; + + private BlockRoadLines(String name, String textureBaseName, int height, boolean yellow) { + super(name, textureBaseName, height, yellow, true); + + this.yellow = yellow; + + registerTexture(textureBaseName + "_inner_right_corner" + (yellow ? "_yellow" : "")); + registerTexture(textureBaseName + "_inner_left_corner" + (yellow ? "_yellow" : "")); + registerTexture(textureBaseName + "_outer_right_corner" + (yellow ? "_yellow" : "")); + registerTexture(textureBaseName + "_outer_left_corner" + (yellow ? "_yellow" : "")); + } + + public static Block[] create(String name, String textureBaseName) { + return create(name, textureBaseName, false); + } + + public static Block[] createYellow(String name, String textureBaseName) { + return create(name, textureBaseName, true); + } + + private static Block[] create(String name, String textureBaseName, boolean yellow) { + return new Block[] { new BlockRoadLines(name, textureBaseName, 0, yellow), + new BlockRoadLines(name, textureBaseName, 1, yellow), + new BlockRoadLines(name, textureBaseName, 2, yellow), + new BlockRoadLines(name, textureBaseName, 3, yellow) }; + } + + /** + * @deprecated Call from BlockRoad. + * @param name + * @param texture + * @return + */ + @Deprecated + public static Block[] create(String name) { + return BlockRoad.create(name); + } + + /** + * @deprecated Call from BlockRoad. + * @param name + * @param texture + * @return + */ + @Deprecated + public static Block[] createYellow(String name) { + return BlockRoad.createYellow(name); + } + + @Override + public TextureAtlasSprite getTextureSprite(@Nullable IBlockState state, + Function textureGetter) { + + String baseTexturePath = getTexturePath(); + + if (state != null) { + IExtendedBlockState extendedState = (IExtendedBlockState) state; + + System.out.println(extendedState.getValue(SHAPE)); + switch (extendedState.getValue(SHAPE)) { + case INNER_RIGHT: + baseTexturePath += "_inner_right_corner"; + break; + case INNER_LEFT: + baseTexturePath += "_inner_left_corner"; + break; + case OUTER_RIGHT: + baseTexturePath += "_outer_right_corner"; + break; + case OUTER_LEFT: + baseTexturePath += "_outer_left_corner"; + break; + default: + break; + } + } + if (yellow) { + baseTexturePath += "_yellow"; + } + + return getTexture(baseTexturePath, textureGetter); + + } + + private static final UnlistedPropertyEnum SHAPE = UnlistedPropertyEnum.create("shape", + BlockStairs.EnumShape.class); + + @Override + public void addInformation(ItemStack stack, World player, List tooltip, ITooltipFlag advanced) { + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + tooltip.add(I18n.format("block.road_lines.tooltip")); + } else { + tooltip.add(I18n.format("gui.tooltip.view_more")); + } + } + + @Override + public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, + float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { + IExtendedBlockState state = (IExtendedBlockState) super.getStateForPlacement(world, pos, facing, hitX, hitY, + hitZ, meta, placer, hand); + state = state.withProperty(SHAPE, BlockStairs.EnumShape.STRAIGHT); + return state; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(FACING).getHorizontalIndex(); + } + + @Override + public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + + IExtendedBlockState extendedState = super.getExtendedState(state, worldIn, pos); + return extendedState.withProperty(SHAPE, getShape(state, worldIn, pos)); + } + + public static BlockStairs.EnumShape getShape(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + EnumFacing facing = state.getValue(FACING); + BlockRoadLines current = (BlockRoadLines) state.getBlock(); + + BlockPos right = pos.offset(facing.rotateYCCW()); + IBlockState rightBlockState = worldIn.getBlockState(right); + if (rightBlockState.getBlock() instanceof BlockRoadLines + && ((BlockRoadLines) rightBlockState.getBlock()).baseName == current.baseName) { + + EnumFacing rightFacing = rightBlockState.getValue(FACING); + if(rightFacing.getAxis() != facing.getAxis()) { + if(rightFacing == facing.rotateYCCW()) { + return BlockStairs.EnumShape.OUTER_LEFT; + }else { + return BlockStairs.EnumShape.OUTER_RIGHT; + } + } + } + + BlockPos left = pos.offset(facing.rotateY()); + IBlockState leftBlockState = worldIn.getBlockState(left); + if (leftBlockState.getBlock() instanceof BlockRoadLines + && ((BlockRoadLines) leftBlockState.getBlock()).baseName == current.baseName) { + + EnumFacing leftFacing = leftBlockState.getValue(FACING); + if(leftFacing.getAxis() != facing.getAxis()) { + if(leftFacing == facing.rotateY()) { + return BlockStairs.EnumShape.INNER_RIGHT; + }else { + return BlockStairs.EnumShape.INNER_LEFT; + } + } + } + + + + + + return BlockStairs.EnumShape.STRAIGHT; + } + + @Override + @SuppressWarnings({ "incomplete-switch", "deprecation" }) + public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { + EnumFacing enumfacing = state.getValue(FACING); + BlockStairs.EnumShape blockstairs_enumshape = ((IExtendedBlockState) state).getValue(SHAPE); + + IExtendedBlockState extendedState = ((IExtendedBlockState) state.withRotation(Rotation.CLOCKWISE_180)); + + switch (mirrorIn) { + case LEFT_RIGHT: + + if (enumfacing.getAxis() == EnumFacing.Axis.Z) { + switch (blockstairs_enumshape) { + case OUTER_LEFT: + return extendedState.withProperty(SHAPE, BlockStairs.EnumShape.OUTER_RIGHT); + case OUTER_RIGHT: + return extendedState.withProperty(SHAPE, BlockStairs.EnumShape.OUTER_LEFT); + case INNER_RIGHT: + return extendedState.withProperty(SHAPE, BlockStairs.EnumShape.INNER_LEFT); + case INNER_LEFT: + return extendedState.withProperty(SHAPE, BlockStairs.EnumShape.INNER_RIGHT); + default: + return extendedState; + } + } + + break; + case FRONT_BACK: + + if (enumfacing.getAxis() == EnumFacing.Axis.X) { + switch (blockstairs_enumshape) { + case OUTER_LEFT: + return extendedState.withProperty(SHAPE, BlockStairs.EnumShape.OUTER_RIGHT); + case OUTER_RIGHT: + return extendedState.withProperty(SHAPE, BlockStairs.EnumShape.OUTER_LEFT); + case INNER_RIGHT: + return extendedState.withProperty(SHAPE, BlockStairs.EnumShape.INNER_RIGHT); + case INNER_LEFT: + return extendedState.withProperty(SHAPE, BlockStairs.EnumShape.INNER_LEFT); + case STRAIGHT: + return extendedState; + } + } + } + + return super.withMirror(state, mirrorIn); + } + + @Override + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, + EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + return false; + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer.Builder(this).add(FACING, TEXTURE_ROTATION) + .add(SLOPE, SLOPE_BOTTOM, HEIGHT, SHAPE).build(); + } + } diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadMarker.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadMarker.java new file mode 100644 index 0000000..227c19f --- /dev/null +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadMarker.java @@ -0,0 +1,59 @@ +package derfl007.roads.common.blocks; + +import derfl007.roads.Roads; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class BlockRoadMarker extends Block { + + public static final AxisAlignedBB MARKER_BB = new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.8D, 0.625D); + + public BlockRoadMarker(String name) { + super(Material.IRON); + this.setUnlocalizedName(name); + this.setRegistryName(name); + this.setCreativeTab(Roads.SIGNS_TAB); + this.setHardness(1.4F); + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, + EnumFacing side) { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return MARKER_BB; + } + + @Override + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return MARKER_BB; + } + +} diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadRotatable.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadRotatable.java deleted file mode 100644 index 0b9c975..0000000 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoadRotatable.java +++ /dev/null @@ -1,276 +0,0 @@ -package derfl007.roads.common.blocks; - -import derfl007.roads.Reference; -import derfl007.roads.Roads; -import derfl007.roads.common.items.ItemWrench; -import net.minecraft.block.Block; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.I18n; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.*; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import org.lwjgl.input.Keyboard; - -import java.util.List; - -public class BlockRoadRotatable extends BlockHorizontal { - public BlockRoadRotatable(String name) { - super(Material.ROCK); - this.setUnlocalizedName(name); - this.setRegistryName(name); - this.setCreativeTab(Roads.ROADS_TAB); - this.setHardness(1.5F); - } - - @Override - public void addInformation(ItemStack stack, World player, List tooltip, ITooltipFlag advanced) { - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { - tooltip.add(I18n.format("block.road_rotatable.tooltip")); - } else { - tooltip.add(I18n.format("gui.tooltip.view_more")); - } - } - - private static final AxisAlignedBB EAST_0 = new AxisAlignedBB(0.0D, -0.2D,0.0D, 1.0D, -0.1D,1.0D); - private static final AxisAlignedBB EAST_1 = new AxisAlignedBB(0.0D, -0.1D,0.0D, 0.9D, 0.0D, 1.0D); - private static final AxisAlignedBB EAST_2 = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.8D, 0.1D, 1.0D); - private static final AxisAlignedBB EAST_3 = new AxisAlignedBB(0.0D, 0.1D, 0.0D, 0.7D, 0.2D, 1.0D); - private static final AxisAlignedBB EAST_4 = new AxisAlignedBB(0.0D, 0.2D, 0.0D, 0.6D, 0.3D, 1.0D); - private static final AxisAlignedBB EAST_5 = new AxisAlignedBB(0.0D, 0.3D, 0.0D, 0.5D, 0.4D, 1.0D); - private static final AxisAlignedBB EAST_6 = new AxisAlignedBB(0.0D, 0.4D, 0.0D, 0.4D, 0.5D, 1.0D); - private static final AxisAlignedBB EAST_7 = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 0.3D, 0.6D, 1.0D); - private static final AxisAlignedBB EAST_8 = new AxisAlignedBB(0.0D, 0.6D, 0.0D, 0.2D, 0.7D, 1.0D); - private static final AxisAlignedBB EAST_9 = new AxisAlignedBB(0.0D, 0.7D, 0.0D, 0.1D, 0.8D, 1.0D); - - private static final AxisAlignedBB SOUTH_0 = new AxisAlignedBB(0.0D, -0.2D,0.0D, 1.0D, -0.1D,1.0D); - private static final AxisAlignedBB SOUTH_1 = new AxisAlignedBB(0.0D, -0.1D,0.0D, 1.0D, 0.0D, 0.9D); - private static final AxisAlignedBB SOUTH_2 = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.1D, 0.8D); - private static final AxisAlignedBB SOUTH_3 = new AxisAlignedBB(0.0D, 0.1D, 0.0D, 1.0D, 0.2D, 0.7D); - private static final AxisAlignedBB SOUTH_4 = new AxisAlignedBB(0.0D, 0.2D, 0.0D, 1.0D, 0.3D, 0.6D); - private static final AxisAlignedBB SOUTH_5 = new AxisAlignedBB(0.0D, 0.3D, 0.0D, 1.0D, 0.4D, 0.5D); - private static final AxisAlignedBB SOUTH_6 = new AxisAlignedBB(0.0D, 0.4D, 0.0D, 1.0D, 0.5D, 0.4D); - private static final AxisAlignedBB SOUTH_7 = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 1.0D, 0.6D, 0.3D); - private static final AxisAlignedBB SOUTH_8 = new AxisAlignedBB(0.0D, 0.6D, 0.0D, 1.0D, 0.7D, 0.2D); - private static final AxisAlignedBB SOUTH_9 = new AxisAlignedBB(0.0D, 0.7D, 0.0D, 1.0D, 0.8D, 0.1D); - - private static final AxisAlignedBB WEST_0 = new AxisAlignedBB(0.0D, -0.2D,0.0D, 1.0D, -0.1D, 1.0D); - private static final AxisAlignedBB WEST_1 = new AxisAlignedBB(0.1D, -0.1D,0.0D, 1.0D, 0.0D, 1.0D); - private static final AxisAlignedBB WEST_2 = new AxisAlignedBB(0.2D, 0.0D, 0.0D, 1.0D, 0.1D, 1.0D); - private static final AxisAlignedBB WEST_3 = new AxisAlignedBB(0.3D, 0.1D, 0.0D, 1.0D, 0.2D, 1.0D); - private static final AxisAlignedBB WEST_4 = new AxisAlignedBB(0.5D, 0.2D, 0.0D, 1.0D, 0.3D, 1.0D); - private static final AxisAlignedBB WEST_5 = new AxisAlignedBB(0.5D, 0.3D, 0.0D, 1.0D, 0.4D, 1.0D); - private static final AxisAlignedBB WEST_6 = new AxisAlignedBB(0.6D, 0.4D, 0.0D, 1.0D, 0.5D, 1.0D); - private static final AxisAlignedBB WEST_7 = new AxisAlignedBB(0.7D, 0.5D, 0.0D, 1.0D, 0.6D, 1.0D); - private static final AxisAlignedBB WEST_8 = new AxisAlignedBB(0.8D, 0.6D, 0.0D, 1.0D, 0.7D, 1.0D); - private static final AxisAlignedBB WEST_9 = new AxisAlignedBB(0.9D, 0.7D, 0.0D, 1.0D, 0.8D, 1.0D); - - private static final AxisAlignedBB NORTH_0 = new AxisAlignedBB(0.0D, -0.2D,0.0D, 1.0D, -0.1D,1.0D); - private static final AxisAlignedBB NORTH_1 = new AxisAlignedBB(0.0D, -0.1D,0.1D, 1.0D, 0.0D, 1.0D); - private static final AxisAlignedBB NORTH_2 = new AxisAlignedBB(0.0D, 0.0D, 0.2D, 1.0D, 0.1D, 1.0D); - private static final AxisAlignedBB NORTH_3 = new AxisAlignedBB(0.0D, 0.1D, 0.3D, 1.0D, 0.2D, 1.0D); - private static final AxisAlignedBB NORTH_4 = new AxisAlignedBB(0.0D, 0.2D, 0.5D, 1.0D, 0.3D, 1.0D); - private static final AxisAlignedBB NORTH_5 = new AxisAlignedBB(0.0D, 0.3D, 0.5D, 1.0D, 0.4D, 1.0D); - private static final AxisAlignedBB NORTH_6 = new AxisAlignedBB(0.0D, 0.4D, 0.6D, 1.0D, 0.5D, 1.0D); - private static final AxisAlignedBB NORTH_7 = new AxisAlignedBB(0.0D, 0.5D, 0.7D, 1.0D, 0.6D, 1.0D); - private static final AxisAlignedBB NORTH_8 = new AxisAlignedBB(0.0D, 0.6D, 0.8D, 1.0D, 0.7D, 1.0D); - private static final AxisAlignedBB NORTH_9 = new AxisAlignedBB(0.0D, 0.7D, 0.9D, 1.0D, 0.8D, 1.0D); - - - private static final PropertyDirection FACING = BlockHorizontal.FACING; - private static final PropertyDirection SLOPE_FACING = PropertyDirection.create("slope_facing", EnumFacing.Plane.HORIZONTAL); - private static final PropertyBool SLOPE = PropertyBool.create("slope"); - - @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, Entity entityIn, boolean isActualState) { - Boolean isSlope = shouldBeSlope(worldIn, pos, state); - EnumFacing facing = state.getValue(FACING); - if(isSlope) { - switch(facing) { - case WEST: - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_0); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_1); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_2); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_3); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_4); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_5); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_6); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_7); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_8); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_9); - break; - case SOUTH: - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_0); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_1); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_2); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_3); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_4); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_5); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_6); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_7); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_8); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_9); - break; - case NORTH: - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_0); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_1); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_2); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_3); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_4); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_5); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_6); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_7); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_8); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_9); - break; - case EAST: - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_0); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_1); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_2); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_3); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_4); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_5); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_6); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_7); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_8); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_9); - break; - default: - break; - } - } else { - addCollisionBoxToList(pos, entityBox, collidingBoxes, Reference.ROAD_BLOCK_AABB); - } - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public boolean isFullBlock(IBlockState state) { - return false; - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public BlockRenderLayer getBlockLayer() { - return BlockRenderLayer.CUTOUT; - } - - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { - return Reference.ROAD_BLOCK_AABB; - } - - private boolean shouldBeSlope(IBlockAccess worldIn, BlockPos pos, IBlockState state) { - Block block_under = worldIn.getBlockState(pos.offset(EnumFacing.DOWN)).getBlock(); - return block_under instanceof BlockRoadRotatable || block_under instanceof BlockRoadLine; - } - - @Override - public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { - IBlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); - state = state.withProperty(FACING, placer.getHorizontalFacing().getOpposite()); - return state; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if(meta < 4) { - return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(0)) - .withProperty(SLOPE_FACING, EnumFacing.getHorizontal(meta)); - } else if(meta < 8) { - return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(1)) - .withProperty(SLOPE_FACING, EnumFacing.getHorizontal(meta-4)); - } else if(meta < 12) { - return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(2)) - .withProperty(SLOPE_FACING, EnumFacing.getHorizontal(meta-8)); - } else { - return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(3)) - .withProperty(SLOPE_FACING, EnumFacing.getHorizontal(meta-12)); - } - } - - @Override - public int getMetaFromState(IBlockState state) { - int facing = state.getValue(FACING).getHorizontalIndex(); - int slopeFacing = state.getValue(SLOPE_FACING).getHorizontalIndex(); - if(facing == 0) { - return slopeFacing; - } else if (facing == 1) { - return 4 + slopeFacing; - } else if (facing == 2) { - return 8 + slopeFacing; - } else if (facing == 3) { - return 12 + slopeFacing; - } else { - return 0; - } - } - - @Override - public IBlockState withRotation(IBlockState state, Rotation rot) { - return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); - } - - @Override - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { - return state.withRotation(mirrorIn.toRotation(state.getValue(FACING))); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, FACING, SLOPE, SLOPE_FACING); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return state.withProperty(SLOPE, shouldBeSlope(worldIn, pos, state)); - } - - @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if(worldIn.isRemote) { - return true; - } - if(playerIn.getHeldItem(EnumHand.MAIN_HAND).getItem() instanceof ItemWrench) { - EnumFacing slopeFacing = worldIn.getBlockState(pos).getValue(SLOPE_FACING); - if(slopeFacing == EnumFacing.NORTH) { - worldIn.setBlockState(pos, state.withProperty(SLOPE_FACING, EnumFacing.EAST).withProperty(SLOPE, shouldBeSlope(worldIn, pos, state))); - } else if(slopeFacing == EnumFacing.EAST) { - worldIn.setBlockState(pos, state.withProperty(SLOPE_FACING, EnumFacing.SOUTH).withProperty(SLOPE, shouldBeSlope(worldIn, pos, state))); - } else if(slopeFacing == EnumFacing.SOUTH) { - worldIn.setBlockState(pos, state.withProperty(SLOPE_FACING, EnumFacing.WEST).withProperty(SLOPE, shouldBeSlope(worldIn, pos, state))); - } else if(slopeFacing == EnumFacing.WEST) { - worldIn.setBlockState(pos, state.withProperty(SLOPE_FACING, EnumFacing.NORTH).withProperty(SLOPE, shouldBeSlope(worldIn, pos, state))); - } else { - worldIn.setBlockState(pos, state.withProperty(SLOPE_FACING, EnumFacing.NORTH).withProperty(SLOPE, shouldBeSlope(worldIn, pos, state))); - } - System.out.println("texture rotated"); - return true; - } - return false; - } - - public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { - return face == EnumFacing.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; - } -} \ No newline at end of file diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadSidewalk.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadSidewalk.java index 600bd61..6a845dd 100644 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoadSidewalk.java +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadSidewalk.java @@ -1,6 +1,9 @@ package derfl007.roads.common.blocks; +import java.util.List; + import com.google.common.collect.Lists; + import derfl007.roads.Reference; import derfl007.roads.Roads; import derfl007.roads.init.RoadBlocks; @@ -14,7 +17,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.*; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -22,8 +29,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class BlockRoadSidewalk extends Block { public BlockRoadSidewalk() { diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadSign.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadSign.java deleted file mode 100644 index c59f8e9..0000000 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoadSign.java +++ /dev/null @@ -1,171 +0,0 @@ -package derfl007.roads.common.blocks; - -import derfl007.roads.Roads; -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen; -import derfl007.roads.init.RoadBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.Mirror; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class BlockRoadSign extends Block { - public BlockRoadSign(String name) { - super(Material.IRON); - this.setUnlocalizedName(name); - this.setRegistryName(name); - this.setCreativeTab(Roads.SIGNS_TAB); - this.setHardness(1.4F); - } - - protected static final PropertyDirection FACING = BlockHorizontal.FACING; - protected static final PropertyBool UP = PropertyBool.create("up"); - protected static final PropertyBool DOWN = PropertyBool.create("down"); - protected static final PropertyBool NORTH = PropertyBool.create("north"); - protected static final PropertyBool SOUTH = PropertyBool.create("south"); - protected static final PropertyBool EAST = PropertyBool.create("east"); - protected static final PropertyBool WEST = PropertyBool.create("west"); - - @Override - public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, - float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { - IBlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); - state = state.withProperty(FACING, placer.getHorizontalFacing().getOpposite()); - return state; - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, - EnumFacing side) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { - return BlockRenderLayer.CUTOUT; - } - - @Override - public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { - super.onBlockAdded(worldIn, pos, state); - } - - @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, - ItemStack stack) { - getActualState(state, worldIn, pos); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta)); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(FACING).getHorizontalIndex(); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - int meta = state.getValue(FACING).getHorizontalIndex(); - switch (meta) { - case 0: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.north())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.south())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.east())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.west())); - case 1: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.east())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.west())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.south())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.north())); - case 2: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.south())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.north())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.west())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.east())); - case 3: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.west())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.east())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.north())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.south())); - default: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.north())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.south())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.east())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.west())); - } - - } - - @Override - public IBlockState withRotation(IBlockState state, Rotation rot) { - return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); - } - - @Override - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { - return state.withRotation(mirrorIn.toRotation(state.getValue(FACING))); - } - - private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { - IBlockState iblockstate = worldIn.getBlockState(pos); - Block block = iblockstate.getBlock(); - String blockname = block.getRegistryName().toString(); - try { - return block instanceof BlockRoadSign || block == RoadBlocks.road_traffic_light - || block == RoadBlocks.road_traffic_light_manual || block == RoadBlocks.road_traffic_light_green - || block == RoadBlocks.road_traffic_light_yellow_fixed || block == RoadBlocks.road_traffic_light_red - || block instanceof BlockRoadTrafficLightGen || block == RoadBlocks.road_pedestrian_traffic_light - || block == RoadBlocks.road_pedestrian_traffic_light_manual; - } catch (StringIndexOutOfBoundsException e) { - return block == RoadBlocks.road_traffic_light || block == RoadBlocks.road_pedestrian_traffic_light; - } - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, FACING, UP, DOWN, NORTH, SOUTH, EAST, WEST); - } - - public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { - return BlockFaceShape.UNDEFINED; - } -} \ No newline at end of file diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadSignLegacy.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadSignLegacy.java new file mode 100644 index 0000000..6bd006f --- /dev/null +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadSignLegacy.java @@ -0,0 +1,88 @@ +package derfl007.roads.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; + +/** + * @deprecated Should not be used for new blocks. + * + */ +@Deprecated +public class BlockRoadSignLegacy extends ExtendedBlockHorizontal { + + public BlockRoadSignLegacy(String name) { + super(name); + } + + private static final PropertyBool UP = PropertyBool.create("up"); + private static final PropertyBool DOWN = PropertyBool.create("down"); + private static final PropertyBool NORTH = PropertyBool.create("north"); + private static final PropertyBool SOUTH = PropertyBool.create("south"); + private static final PropertyBool EAST = PropertyBool.create("east"); + private static final PropertyBool WEST = PropertyBool.create("west"); + + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + int meta = state.getValue(FACING).getHorizontalIndex(); + switch (meta) { + case 0: + return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) + .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) + .withProperty(NORTH, this.canConnectTo(worldIn, pos.north())) + .withProperty(SOUTH, this.canConnectTo(worldIn, pos.south())) + .withProperty(EAST, this.canConnectTo(worldIn, pos.east())) + .withProperty(WEST, this.canConnectTo(worldIn, pos.west())); + case 1: + return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) + .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) + .withProperty(NORTH, this.canConnectTo(worldIn, pos.east())) + .withProperty(SOUTH, this.canConnectTo(worldIn, pos.west())) + .withProperty(EAST, this.canConnectTo(worldIn, pos.south())) + .withProperty(WEST, this.canConnectTo(worldIn, pos.north())); + case 2: + return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) + .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) + .withProperty(NORTH, this.canConnectTo(worldIn, pos.south())) + .withProperty(SOUTH, this.canConnectTo(worldIn, pos.north())) + .withProperty(EAST, this.canConnectTo(worldIn, pos.west())) + .withProperty(WEST, this.canConnectTo(worldIn, pos.east())); + case 3: + return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) + .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) + .withProperty(NORTH, this.canConnectTo(worldIn, pos.west())) + .withProperty(SOUTH, this.canConnectTo(worldIn, pos.east())) + .withProperty(EAST, this.canConnectTo(worldIn, pos.north())) + .withProperty(WEST, this.canConnectTo(worldIn, pos.south())); + default: + return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) + .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) + .withProperty(NORTH, this.canConnectTo(worldIn, pos.north())) + .withProperty(SOUTH, this.canConnectTo(worldIn, pos.south())) + .withProperty(EAST, this.canConnectTo(worldIn, pos.east())) + .withProperty(WEST, this.canConnectTo(worldIn, pos.west())); + } + + } + + + private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { + IBlockState iblockstate = worldIn.getBlockState(pos); + Block block = iblockstate.getBlock(); + String blockname = block.getRegistryName().toString(); + return block instanceof ExtendedBlockHorizontal || block instanceof BlockRoadSignRotatable; + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, FACING, POWER, UP, DOWN, NORTH, SOUTH, EAST, WEST); + + } + +} diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadSignPost.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadSignPost.java index d778428..70c509a 100644 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoadSignPost.java +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadSignPost.java @@ -14,106 +14,104 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -public class BlockRoadSignPost extends Block { - private static final PropertyBool UP = PropertyBool.create("up"); - private static final PropertyBool DOWN = PropertyBool.create("down"); - private static final PropertyBool NORTH = PropertyBool.create("north"); - private static final PropertyBool EAST = PropertyBool.create("east"); - private static final PropertyBool SOUTH = PropertyBool.create("south"); - private static final PropertyBool WEST = PropertyBool.create("west"); +public class BlockRoadSignPost extends BlockRedstoneTransmitter { + private static final PropertyBool UP = PropertyBool.create("up"); + private static final PropertyBool DOWN = PropertyBool.create("down"); + private static final PropertyBool NORTH = PropertyBool.create("north"); + private static final PropertyBool EAST = PropertyBool.create("east"); + private static final PropertyBool SOUTH = PropertyBool.create("south"); + private static final PropertyBool WEST = PropertyBool.create("west"); - public BlockRoadSignPost() { - super(Material.IRON); - this.setRegistryName("road_sign_post"); - this.setUnlocalizedName("road_sign_post"); - this.setDefaultState(this.blockState.getBaseState().withProperty(UP, false) - .withProperty(DOWN, false).withProperty(NORTH, false) - .withProperty(EAST, false).withProperty(SOUTH, false) - .withProperty(WEST,false)); - this.setCreativeTab(Roads.ROADS_TAB); - this.setHardness(1.0F); - } + public BlockRoadSignPost() { + super(Material.IRON); + this.setRegistryName("road_sign_post"); + this.setUnlocalizedName("road_sign_post"); + this.setDefaultState(this.blockState.getBaseState().withProperty(UP, false).withProperty(DOWN, false) + .withProperty(NORTH, false).withProperty(EAST, false).withProperty(SOUTH, false) + .withProperty(WEST, false).withProperty(POWER, 0)); + this.setCreativeTab(Roads.ROADS_TAB); + this.setHardness(1.0F); + } - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } - @Override - public boolean isFullCube(IBlockState state) { - return false; - } + @Override + public boolean isFullCube(IBlockState state) { + return false; + } - private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { - IBlockState iblockstate = worldIn.getBlockState(pos); - Block block = iblockstate.getBlock(); - return block != Blocks.AIR; + private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { + IBlockState iblockstate = worldIn.getBlockState(pos); + Block block = iblockstate.getBlock(); + return block != Blocks.AIR; + } - } + /** + * Convert the BlockState into the correct metadata value + */ + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } - /** - * Convert the BlockState into the correct metadata value - */ - @Override - public int getMetaFromState(IBlockState state) { - return 0; - } + /** + * Get the actual Block state of this Block at the given position. This applies + * properties not visible in the metadata, such as fence connections. + */ + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + return super.getActualState(state, worldIn, pos).withProperty(UP, this.canConnectTo(worldIn, pos.up())) + .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) + .withProperty(NORTH, this.canConnectTo(worldIn, pos.north())) + .withProperty(EAST, this.canConnectTo(worldIn, pos.east())) + .withProperty(SOUTH, this.canConnectTo(worldIn, pos.south())) + .withProperty(WEST, this.canConnectTo(worldIn, pos.west())); + } - /** - * Get the actual Block state of this Block at the given position. This - * applies properties not visible in the metadata, such as fence - * connections. - */ - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.north())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.east())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.south())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.west())); - } + /** + * Returns the blockstate with the given rotation from the passed blockstate. If + * inapplicable, returns the passed blockstate. + */ + @Override + public IBlockState withRotation(IBlockState state, Rotation rot) { + switch (rot) { + case CLOCKWISE_180: + return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(EAST, state.getValue(WEST)) + .withProperty(SOUTH, state.getValue(NORTH)).withProperty(WEST, state.getValue(EAST)); + case COUNTERCLOCKWISE_90: + return state.withProperty(NORTH, state.getValue(EAST)).withProperty(EAST, state.getValue(SOUTH)) + .withProperty(SOUTH, state.getValue(WEST)).withProperty(WEST, state.getValue(NORTH)); + case CLOCKWISE_90: + return state.withProperty(NORTH, state.getValue(WEST)).withProperty(EAST, state.getValue(NORTH)) + .withProperty(SOUTH, state.getValue(EAST)).withProperty(WEST, state.getValue(SOUTH)); + default: + return state; + } + } - /** - * Returns the blockstate with the given rotation from the passed - * blockstate. If inapplicable, returns the passed blockstate. - */ - @Override - public IBlockState withRotation(IBlockState state, Rotation rot) { - switch (rot) { - case CLOCKWISE_180: - return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(EAST, state.getValue(WEST)) - .withProperty(SOUTH, state.getValue(NORTH)).withProperty(WEST, state.getValue(EAST)); - case COUNTERCLOCKWISE_90: - return state.withProperty(NORTH, state.getValue(EAST)).withProperty(EAST, state.getValue(SOUTH)) - .withProperty(SOUTH, state.getValue(WEST)).withProperty(WEST, state.getValue(NORTH)); - case CLOCKWISE_90: - return state.withProperty(NORTH, state.getValue(WEST)).withProperty(EAST, state.getValue(NORTH)) - .withProperty(SOUTH, state.getValue(EAST)).withProperty(WEST, state.getValue(SOUTH)); - default: - return state; - } - } + @SuppressWarnings("deprecation") + @Override + public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { + switch (mirrorIn) { + case LEFT_RIGHT: + return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(SOUTH, state.getValue(NORTH)); + case FRONT_BACK: + return state.withProperty(EAST, state.getValue(WEST)).withProperty(WEST, state.getValue(EAST)); + default: + return super.withMirror(state, mirrorIn); + } + } - @SuppressWarnings("deprecation") - @Override - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { - switch (mirrorIn) { - case LEFT_RIGHT: - return state.withProperty(NORTH, state.getValue(SOUTH)).withProperty(SOUTH, state.getValue(NORTH)); - case FRONT_BACK: - return state.withProperty(EAST, state.getValue(WEST)).withProperty(WEST, state.getValue(EAST)); - default: - return super.withMirror(state, mirrorIn); - } - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer.Builder(this).add(UP, DOWN, NORTH, SOUTH, EAST, WEST).add(POWER).build(); + } - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, UP, DOWN, NORTH, EAST, WEST, SOUTH); - } + public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { + return BlockFaceShape.UNDEFINED; + } - public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { - return BlockFaceShape.UNDEFINED; - } } \ No newline at end of file diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadSignRotatable.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadSignRotatable.java new file mode 100644 index 0000000..602cbb3 --- /dev/null +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadSignRotatable.java @@ -0,0 +1,212 @@ +package derfl007.roads.common.blocks; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import derfl007.roads.Roads; +import derfl007.roads.common.util.BlockStateUtil; +import derfl007.roads.common.util.SignOrientation; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.BlockFaceShape; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class BlockRoadSignRotatable extends BlockRedstoneTransmitter implements IBlockConnectable { + + private static final Set REGISTERED_TEXTURES = new HashSet<>(); + + public static Set getRegisteredTextures() { + return Collections.unmodifiableSet(REGISTERED_TEXTURES); + } + + private BlockRoadSignRotatable(String name) { + super(Material.IRON); + this.setUnlocalizedName(name); + this.setRegistryName(name); + this.setCreativeTab(Roads.SIGNS_TAB); + this.setHardness(1.4F); + + } + + public BlockRoadSignRotatable(String name, String backTexturePath) { + this(name); + + this.backTexturePath = backTexturePath; + REGISTERED_TEXTURES.add(backTexturePath); + + this.frontTexturePath = name; + REGISTERED_TEXTURES.add(name); + + } + + public BlockRoadSignRotatable(String name, String frontTexturePath, String backTexturePath) { + this(name); + + this.backTexturePath = backTexturePath; + REGISTERED_TEXTURES.add(backTexturePath); + + this.frontTexturePath = frontTexturePath; + REGISTERED_TEXTURES.add(frontTexturePath); + } + + public static final String BACK_ROUND = "road_sign_back_round"; + public static final String BACK_SQUARE = "road_sign_back_square"; + public static final String BACK_TRIANGLE = "road_sign_back_triangle"; + public static final String BACK_INVERTED_TRIANGLE = "road_sign_priority_1_back"; + public static final String BACK_HEXAGONAL = "road_sign_priority_2_back"; + public static final String BACK_DIAMOND = "road_sign_priority_3_back"; + public static final String BACK_SMALL_HORIZONTAL_RECTANGLE = "road_sign_info_10_back"; + public static final String BACK_SMALL_VERTICAL_RECTANGLE = "road_sign_warn_6c_back"; + public static final String BACK_AVERAGE_VERTICAL_RECTANGLE = "road_sign_info_23_back"; + public static final String BACK_ARROW_RIGHT = "road_sign_info_16b_back"; + public static final String BACK_ARROW_LEFT = "road_sign_info_16a_back"; + public static final String BACK_HORIZONTAL_RECTANGLE = "road_sign_back_rect_2"; + public static final String BACK_VERTICAL_RECTANGLE = "road_sign_back_rect"; + public static final String BACK_SMALL_HORIZONTAL_TOP_RECTANGLE = "road_sign_meta_back"; + + public static final PropertyInteger ORIENTATION = PropertyInteger.create("orientation", 0, 15); + + private String frontTexturePath; + private String backTexturePath; + + public String getFrontTexturePath() { + return this.frontTexturePath; + } + + public String getBackTexturePath() { + return this.backTexturePath; + } + + @Override + public final boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, + EnumFacing side) { + return true; + } + + @Override + public final IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, + float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { + + IBlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); + state = state.withProperty(ORIENTATION, (int) (((540 + placer.rotationYaw % 360) % 360) / 22.5)); + + return state; + } + + public final IBlockState getStateFromMeta(int meta) { + return this.getDefaultState().withProperty(ORIENTATION, SignOrientation.fromMetadata(meta)); + } + + public final int getMetaFromState(IBlockState state) { + return SignOrientation.toMetadata(state.getValue(ORIENTATION)); + } + + public final IBlockState withRotation(IBlockState state, Rotation rot) { + + int orientation = state.getValue(ORIENTATION); + + switch (rot) { + case CLOCKWISE_180: + orientation = (orientation + 8) % 16; + break; + case CLOCKWISE_90: + orientation = (orientation + 4) % 16; + break; + case COUNTERCLOCKWISE_90: + orientation = (orientation + 12) % 16; + break; + default: + break; + } + return state.withProperty(ORIENTATION, orientation); + } + + public final IBlockState withMirror(IBlockState state, Mirror mirrorIn) { + return state.withProperty(ORIENTATION, mirrorIn.mirrorRotation(state.getValue(ORIENTATION), 16)); + } + + @Override + protected final BlockStateContainer createBlockState() { + return new BlockStateContainer.Builder(this).add(ORIENTATION, POWER).add(UP, DOWN, NORTH, SOUTH, EAST, WEST) + .build(); + } + + @Override + public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + return BlockStateUtil.getExtendedState(this, state, worldIn, pos); + } + + @Override + public boolean canConnectTo(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing direction) { + + BlockPos target = pos.offset(direction); + + if (canConnectInDirection(worldIn, state, direction)) { + + IBlockState iblockstate = worldIn.getBlockState(target); + Block block = iblockstate.getBlock(); + if (block instanceof BlockRoadSignRotatable) { + return canConnectInDirection(worldIn, iblockstate, direction.getOpposite()); + } + if (block instanceof ExtendedBlockHorizontal) { + return iblockstate.getValue(ExtendedBlockHorizontal.FACING) != direction.getOpposite(); + } + + return state.isFullBlock(); + + } + return false; + + } + + private boolean canConnectInDirection(IBlockAccess worldIn, IBlockState currentState, EnumFacing direction) { + int rotation = currentState.getValue(ORIENTATION); + + return !SignOrientation.intersects(rotation, direction); + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; + } + + @Override + public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { + super.onBlockAdded(worldIn, pos, state); + + System.out.println(state); + + } + + public final BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, + EnumFacing face) { + return BlockFaceShape.UNDEFINED; + } + +} diff --git a/src/main/java/derfl007/roads/common/blocks/BlockRoadTownSign.java b/src/main/java/derfl007/roads/common/blocks/BlockRoadTownSign.java index 65f9b46..0753cd4 100644 --- a/src/main/java/derfl007/roads/common/blocks/BlockRoadTownSign.java +++ b/src/main/java/derfl007/roads/common/blocks/BlockRoadTownSign.java @@ -2,44 +2,21 @@ import derfl007.roads.Roads; import derfl007.roads.common.tileentities.TileEntityRoadTownSign; -import derfl007.roads.init.RoadBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockRoadTownSign extends Block { +public class BlockRoadTownSign extends BlockRoadSignRotatable { public BlockRoadTownSign(String name) { - super(Material.IRON); - this.setUnlocalizedName(name); - this.setRegistryName(name); - this.setCreativeTab(Roads.SIGNS_TAB); - this.setHardness(1.4F); + super(name, "road_town_sign_back"); } - - public static final PropertyDirection FACING = BlockHorizontal.FACING; - private static final PropertyBool UP = PropertyBool.create("up"); - private static final PropertyBool DOWN = PropertyBool.create("down"); - private static final PropertyBool NORTH = PropertyBool.create("north"); - private static final PropertyBool SOUTH = PropertyBool.create("south"); - private static final PropertyBool EAST = PropertyBool.create("east"); - private static final PropertyBool WEST = PropertyBool.create("west"); - + @Override public boolean hasTileEntity(IBlockState state) { return true; @@ -49,82 +26,13 @@ public boolean hasTileEntity(IBlockState state) { public TileEntity createTileEntity(World worldIn, IBlockState state) { return new TileEntityRoadTownSign(); } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { - IBlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); - state = state.withProperty(FACING, placer.getHorizontalFacing().getOpposite()); - return state; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta)); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(FACING).getHorizontalIndex(); - } + @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { if (placer instanceof EntityPlayer) ((EntityPlayer) placer).openGui(Roads.instance, 0, worldIn, pos.getX(), pos.getY(), pos.getZ()); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - int meta = state.getValue(FACING).getHorizontalIndex(); - switch (meta) { - case 0: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.north())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.south())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.east())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.west())); - case 1: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.east())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.west())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.south())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.north())); - case 2: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.south())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.north())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.west())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.east())); - case 3: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.west())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.east())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.north())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.south())); - default: - return state.withProperty(UP, this.canConnectTo(worldIn, pos.up())) - .withProperty(DOWN, this.canConnectTo(worldIn, pos.down())) - .withProperty(NORTH, this.canConnectTo(worldIn, pos.north())) - .withProperty(SOUTH, this.canConnectTo(worldIn, pos.south())) - .withProperty(EAST, this.canConnectTo(worldIn, pos.east())) - .withProperty(WEST, this.canConnectTo(worldIn, pos.west())); - } - - } - - private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { - IBlockState iblockstate = worldIn.getBlockState(pos); - Block block = iblockstate.getBlock(); - return block.getClass() == RoadBlocks.road_sign_info_1a.getClass() || block == RoadBlocks.road_traffic_light - || block == RoadBlocks.road_pedestrian_traffic_light || block == RoadBlocks.road_sign_post; + + super.onBlockPlacedBy(worldIn, pos, state, placer, stack); } @Override @@ -132,12 +40,4 @@ public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT; } - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, FACING, UP, DOWN, NORTH, SOUTH, EAST, WEST); - } - - public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { - return BlockFaceShape.UNDEFINED; - } } \ No newline at end of file diff --git a/src/main/java/derfl007/roads/common/blocks/BlockSignPrinter.java b/src/main/java/derfl007/roads/common/blocks/BlockSignPrinter.java index 842c936..690bf06 100644 --- a/src/main/java/derfl007/roads/common/blocks/BlockSignPrinter.java +++ b/src/main/java/derfl007/roads/common/blocks/BlockSignPrinter.java @@ -11,7 +11,11 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/derfl007/roads/common/blocks/ExtendedBlockHorizontal.java b/src/main/java/derfl007/roads/common/blocks/ExtendedBlockHorizontal.java new file mode 100644 index 0000000..a3f1e9b --- /dev/null +++ b/src/main/java/derfl007/roads/common/blocks/ExtendedBlockHorizontal.java @@ -0,0 +1,87 @@ +package derfl007.roads.common.blocks; + +import derfl007.roads.Roads; +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.block.state.BlockFaceShape; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public abstract class ExtendedBlockHorizontal extends BlockRedstoneTransmitter { + + public ExtendedBlockHorizontal(String name) { + super(Material.IRON); + this.setUnlocalizedName(name); + this.setRegistryName(name); + this.setCreativeTab(Roads.SIGNS_TAB); + this.setHardness(1.4F); + } + + public static final PropertyDirection FACING = BlockHorizontal.FACING; + + @Override + public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, + float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { + IBlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); + state = state.withProperty(FACING, placer.getHorizontalFacing().getOpposite()); + return state; + } + + @Override + public final boolean isFullCube(IBlockState state) { + return false; + } + + @Override + public final boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public final boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, + EnumFacing side) { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public final BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(FACING).getHorizontalIndex(); + } + + @Override + public final IBlockState withRotation(IBlockState state, Rotation rot) { + return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); + } + + @Override + public final IBlockState withMirror(IBlockState state, Mirror mirrorIn) { + return state.withRotation(mirrorIn.toRotation(state.getValue(FACING))); + } + + public final BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) { + return BlockFaceShape.UNDEFINED; + } + +} \ No newline at end of file diff --git a/src/main/java/derfl007/roads/common/blocks/IBlockConnectable.java b/src/main/java/derfl007/roads/common/blocks/IBlockConnectable.java new file mode 100644 index 0000000..24f1b82 --- /dev/null +++ b/src/main/java/derfl007/roads/common/blocks/IBlockConnectable.java @@ -0,0 +1,19 @@ +package derfl007.roads.common.blocks; + +import derfl007.roads.common.util.UnlistedPropertyBoolean; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; + +public interface IBlockConnectable { + static final UnlistedPropertyBoolean UP = new UnlistedPropertyBoolean("up"); + static final UnlistedPropertyBoolean DOWN = new UnlistedPropertyBoolean("down"); + static final UnlistedPropertyBoolean NORTH = new UnlistedPropertyBoolean("north"); + static final UnlistedPropertyBoolean SOUTH = new UnlistedPropertyBoolean("south"); + static final UnlistedPropertyBoolean EAST = new UnlistedPropertyBoolean("east"); + static final UnlistedPropertyBoolean WEST = new UnlistedPropertyBoolean("west"); + + boolean canConnectTo(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing direction); + +} diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLight.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLight.java index 30acc66..6a14799 100644 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLight.java +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLight.java @@ -1,26 +1,43 @@ package derfl007.roads.common.blocks.trafficlights; -import derfl007.roads.common.blocks.BlockRoadSign; -import derfl007.roads.init.RoadBlocks; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.properties.PropertyDirection; +import derfl007.roads.Roads; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockRoadTrafficLight extends BlockRoadSign { - - public static final PropertyDirection FACING = BlockHorizontal.FACING; - - public BlockRoadTrafficLight(){ +public class BlockRoadTrafficLight extends BlockRoadTrafficLightBase { + + public BlockRoadTrafficLight() { super("road_traffic_light_manual"); } - + + @Override + public CreativeTabs getCreativeTabToDisplayOn() { + return Roads.SIGNS_TAB; + } + @Override public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { - super.onBlockAdded(worldIn, pos, state); - worldIn.setBlockState(pos, RoadBlocks.road_traffic_light_green_dyn.getDefaultState().withProperty(FACING, state.getValue(FACING)), 2); + setLightsState(worldIn, pos, LightsState.GREEN); + } + + @Override + public LightsState getState() { + // TODO Auto-generated method stub + return LightsState.GREEN; // for item rendering + } + + @Override + protected void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + + } + + @Override + protected void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + } } diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightBase.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightBase.java new file mode 100644 index 0000000..0c48ddf --- /dev/null +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightBase.java @@ -0,0 +1,383 @@ +package derfl007.roads.common.blocks.trafficlights; + +import java.util.NoSuchElementException; +import java.util.Random; + +import derfl007.roads.common.blocks.BlockRoadSignRotatable; +import derfl007.roads.common.blocks.ExtendedBlockHorizontal; +import derfl007.roads.common.blocks.IBlockConnectable; +import derfl007.roads.common.commands.light.CommandTrafficLightsLightAdd; +import derfl007.roads.common.items.ItemTrafficRemote; +import derfl007.roads.common.items.ItemWrench; +import derfl007.roads.common.util.BlockStateUtil; +import derfl007.roads.init.RoadBlocks; +import derfl007.roads.trafficlights.LightsSetList; +import derfl007.roads.trafficlights.PropertyMode; +import net.minecraft.block.Block; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.property.IExtendedBlockState; + +public abstract class BlockRoadTrafficLightBase extends ExtendedBlockHorizontal implements IBlockConnectable { + + public enum LightsState { + GREEN, YELLOW, DEACTIVATED, RED + } + + public boolean isPedestrianLights() { + return false; + } + + public abstract LightsState getState(); + + private static final PropertyBool POWERED = PropertyBool.create("powered"); + protected static final PropertyMode CONTROL_MODE = new PropertyMode("control_mode"); + + public static final int DEFAULT_YELLOW_DURATION = 3; + + public enum TrafficLightsControlMode { + deactivated(0), redstone_controlled(1), command_controlled(2); // Names have to break Java naming conventions + // because uppercase letters are not allowed in block properties. + + public final int index; + + TrafficLightsControlMode(int index) { + this.index = index; + } + + static TrafficLightsControlMode fromIndex(int index) { + for (TrafficLightsControlMode mode : TrafficLightsControlMode.values()) { + if (mode.index == index) { + return mode; + } + } + throw new NoSuchElementException(); + } + + TrafficLightsControlMode next() { + switch (this) { + case redstone_controlled: + return command_controlled; + case command_controlled: + return deactivated; + default: + return redstone_controlled; + } + } + } + + public BlockRoadTrafficLightBase(String unlocalizedName) { + super(unlocalizedName); + this.setDefaultState(this.getDefaultState().withProperty(POWERED, false).withProperty(CONTROL_MODE, + TrafficLightsControlMode.redstone_controlled)); + // setTickRandomly(true); + // this.setCreativeTab(null); + } + + @Override + public CreativeTabs getCreativeTabToDisplayOn() { + return null; + } + + /** + * Called when the block is right clicked by a player. + */ + @Override + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, + EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + + if (worldIn.isRemote) { + return super.onBlockActivated(worldIn, pos, state, playerIn, hand, facing, hitX, hitY, hitZ); + } + if (!playerIn.capabilities.allowEdit) { + playerIn.sendMessage(new TextComponentTranslation("commands.generic.permission")); + return super.onBlockActivated(worldIn, pos, state, playerIn, hand, facing, hitX, hitY, hitZ); + } + ItemStack itemstack = playerIn.getHeldItem(hand); + + if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemWrench) { + + blockToggled(worldIn, pos, state, playerIn); + + return true; + } else if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemTrafficRemote) { + + CommandTrafficLightsLightAdd.addLight(pos, playerIn, this, worldIn, state); + return true; + } + + return super.onBlockActivated(worldIn, pos, state, playerIn, hand, facing, hitX, hitY, hitZ); + + } + + @Override + public final IBlockState getStateFromMeta(int meta) { + int facing = meta % 4; + int modeIndex = (meta - facing) / 4; + TrafficLightsControlMode mode = TrafficLightsControlMode.fromIndex(modeIndex); + + return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta % 4)) + .withProperty(CONTROL_MODE, mode); + } + + @Override + public final int getMetaFromState(IBlockState state) { + return super.getMetaFromState(state) + getMode(state).index * 4; + } + + /** + * Called after the block is set in the Chunk data, but before the Tile Entity + * is set + */ + @Override + public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { + super.onBlockAdded(worldIn, pos, state); + + if (worldIn.isRemote) { + return; + } + notifyRedstoneSignal(worldIn, pos, state, true); + + worldIn.scheduleUpdate(pos, this, this.tickRate(worldIn)); + } + + @Override + public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { + super.updateTick(worldIn, pos, state, rand); + + if (!isPlaced(worldIn, pos)) { + return; + } + if (worldIn.isRemote) { + return; + } + if (getMode(state) != TrafficLightsControlMode.redstone_controlled) { + return; + } + + notifyRedstoneSignal(worldIn, pos, state, false); + + worldIn.scheduleUpdate(pos, this, this.tickRate(worldIn)); + } + + /** + * Called when a neighboring block was changed and marks that this state should + * perform any checks during a neighbor change. Cases may include when redstone + * power is updated, cactus blocks popping off due to a neighboring solid block, + * etc. + */ + @Override + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { + if (worldIn.isRemote) { + return; + } + notifyRedstoneSignal(worldIn, pos, state, false); + } + + protected Block getTextureForLightsState(LightsState state) { + switch (state) { + case GREEN: + return RoadBlocks.road_traffic_light_green; + case YELLOW: + return RoadBlocks.road_traffic_light_yellow; + case RED: + return RoadBlocks.road_traffic_light_red; + case DEACTIVATED: + return RoadBlocks.road_traffic_light_yellow_blinking; + default: + throw new IllegalArgumentException(); + } + } + + public final void setLightsState(World worldIn, BlockPos pos, LightsState newState) { + if (getState() == LightsState.DEACTIVATED) { + return; + } + if (newState == LightsState.DEACTIVATED) { + throw new UnsupportedOperationException("Must be deactivated with a wrench"); + } + replaceBlockState(worldIn, pos, getTextureForLightsState(newState)); + } + + private void lightsActivated(World worldIn, BlockPos pos) { + replaceBlockState(worldIn, pos, getTextureForLightsState(LightsState.GREEN)); + } + + private void lightsDeactivated(World worldIn, BlockPos pos) { + replaceBlockState(worldIn, pos, getTextureForLightsState(LightsState.DEACTIVATED)); + } + + private void notifyRedstoneSignal(World worldIn, BlockPos pos, IBlockState state, boolean force) { + if (worldIn.isRemote) { + return; + } + if (!isPlaced(worldIn, pos)) { + return; + } + boolean isPowered = isPowered(worldIn, pos); + boolean wasPowered = getSavedPowered(state); + + setPowered(worldIn, pos, state, isPowered(worldIn, pos)); + + if (!force && isPowered == wasPowered) { + return; + } + + if (getMode(state) != TrafficLightsControlMode.redstone_controlled) { + return; + } + + if (isPowered) { + System.out.println("Notifying signal received"); + redstoneSignalReceived(worldIn, pos, state); + } else { + redstoneSignalInterrupted(worldIn, pos, state); + } + } + + protected abstract void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state); + + protected abstract void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state); + + private void modeChanged(World worldIn, BlockPos pos, TrafficLightsControlMode newMode, EntityPlayer player) { + + if (newMode == TrafficLightsControlMode.deactivated) { + lightsDeactivated(worldIn, pos); + } else { + lightsActivated(worldIn, pos); + } + + switch (newMode) { + case redstone_controlled: + player.sendMessage(new TextComponentTranslation("dfroads.trafficlight.mode.redstone_controlled")); + break; + case command_controlled: + player.sendMessage(new TextComponentTranslation("dfroads.trafficlight.mode.command_controlled")); + break; + case deactivated: + player.sendMessage(new TextComponentTranslation("dfroads.trafficlight.mode.deactivated")); + break; + } + if (LightsSetList.get(worldIn).lightAlreadyUsed(pos) + && newMode != TrafficLightsControlMode.command_controlled) { + player.sendMessage(new TextComponentTranslation("dfroads.trafficlight.mode.deprecated")); + } + + } + + private void blockToggled(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) { + if (worldIn.isRemote) { + return; + } + if (!isPlaced(worldIn, pos)) { + return; + } + + TrafficLightsControlMode newMode = getMode(state).next(); + state = state.withProperty(CONTROL_MODE, newMode); + + worldIn.setBlockState(pos, state, 2); + + modeChanged(worldIn, pos, newMode, player); + + worldIn.scheduleUpdate(pos, this, this.tickRate(worldIn)); + + } + + protected void replaceBlockState(World worldIn, BlockPos pos, Block blockTexture) { + if (this.equals(blockTexture)) { + return; + } + IBlockState currentState = worldIn.getBlockState(pos); + if (currentState.getBlock() instanceof BlockRoadTrafficLightBase) { + worldIn.setBlockState(pos, + blockTexture.getDefaultState().withProperty(FACING, currentState.getValue(FACING)) + .withProperty(CONTROL_MODE, currentState.getValue(CONTROL_MODE)), + 2); + } + } + + private void setPowered(World worldIn, BlockPos pos, IBlockState state, boolean powered) { + if (powered == getSavedPowered(state)) { + return; + } + worldIn.setBlockState(pos, state.withProperty(POWERED, powered), 2); + } + + protected final boolean getSavedPowered(IBlockState state) { + return state.getValue(POWERED); + } + + public TrafficLightsControlMode getMode(IBlockState state) { + return state.getValue(CONTROL_MODE); + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer.Builder(this).add(FACING, CONTROL_MODE, POWERED, POWER) + .add(UP, DOWN, NORTH, SOUTH, EAST, WEST).build(); + } + + /** + * Get the Item that this Block should drop when harvested. + */ + @Override + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return Item.getItemFromBlock(RoadBlocks.road_traffic_light_manual); + } + + @Override + public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { + return new ItemStack(RoadBlocks.road_traffic_light_manual); + } + + @Override + protected ItemStack getSilkTouchDrop(IBlockState state) { + return new ItemStack(RoadBlocks.road_traffic_light_manual); + } + + protected final boolean isPlaced(World worldIn, BlockPos pos) { + return worldIn.getBlockState(pos).getBlock().equals(this); + } + + protected final boolean isPowered(World worldIn, BlockPos pos) { + return isPlaced(worldIn, pos) && worldIn.isBlockPowered(pos); + } + + @Override + public final IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, + float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { + return super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand) + .withProperty(CONTROL_MODE, TrafficLightsControlMode.redstone_controlled); + } + + private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { + IBlockState iblockstate = worldIn.getBlockState(pos); + Block block = iblockstate.getBlock(); + String blockname = block.getRegistryName().toString(); + return block instanceof ExtendedBlockHorizontal || block instanceof BlockRoadSignRotatable; + } + + @Override + public boolean canConnectTo(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing side) { + return canConnectTo(worldIn, pos.offset(side)); + } + + @Override + public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + return BlockStateUtil.getExtendedState(this, state, worldIn, pos); + } + +} diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightBlinkingYellow.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightBlinkingYellow.java index 3628567..2b9139b 100644 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightBlinkingYellow.java +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightBlinkingYellow.java @@ -1,43 +1,36 @@ package derfl007.roads.common.blocks.trafficlights; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockRoadTrafficLightBlinkingYellow extends BlockRoadTrafficLightGen { +public class BlockRoadTrafficLightBlinkingYellow extends BlockRoadTrafficLightBase { public BlockRoadTrafficLightBlinkingYellow() { super("road_traffic_light_yellow_blinking"); - this.setDefaultState(this.getDefaultState().withProperty(CONTROL_MODE, Mode.deactivated)); + this.setDefaultState(this.getDefaultState().withProperty(CONTROL_MODE, TrafficLightsControlMode.deactivated)); } @Override - protected void updateState(boolean updated, World worldIn, BlockPos pos, IBlockState state) { - return; + protected void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state) { + } - /** - * Called after the block is set in the Chunk data, but before the Tile Entity - * is set - */ @Override - public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { - super.setMode(worldIn, pos, state, Mode.deactivated); + public LightsState getState() { + // TODO Auto-generated method stub + return LightsState.DEACTIVATED; } - + @Override - @Deprecated - public void setMode(World worldIn, BlockPos pos, IBlockState state, Mode mode) { - throw new IllegalStateException("Must be activated with wrench."); + public TrafficLightsControlMode getMode(IBlockState state) { + return TrafficLightsControlMode.deactivated; } @Override - protected List getLegalModes() { - return new ArrayList(Arrays.asList(Mode.deactivated)); + protected void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + } } diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightGen.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightGen.java deleted file mode 100644 index de109b3..0000000 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightGen.java +++ /dev/null @@ -1,353 +0,0 @@ -package derfl007.roads.common.blocks.trafficlights; - -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Random; - -import javax.annotation.Nullable; - -import derfl007.roads.common.blocks.BlockRoadSign; -import derfl007.roads.common.commands.light.CommandTrafficLightsLightAdd; -import derfl007.roads.common.items.ItemTrafficRemote; -import derfl007.roads.common.items.ItemWrench; -import derfl007.roads.init.RoadBlocks; -import derfl007.roads.trafficlights.LightsSetList; -import derfl007.roads.trafficlights.PropertyMode; -import net.minecraft.block.Block; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public abstract class BlockRoadTrafficLightGen extends BlockRoadSign { - - protected static final PropertyBool POWERED = PropertyBool.create("powered"); - protected static final PropertyMode CONTROL_MODE = new PropertyMode("control_mode"); - - public static final int YELLOW_DURATION = 60; // 3 seconds - - public enum Mode { - deactivated(0), redstone_controlled(1), command_controlled(2); // Names have to break Java naming conventions - // because uppercase letters are not allowed in block properties. - - public final int index; - - Mode(int index) { - this.index = index; - } - - static Mode fromIndex(int index) { - for (Mode mode : Mode.values()) { - if (mode.index == index) { - return mode; - } - } - throw new NoSuchElementException(); - } - } - - protected abstract List getLegalModes(); - - public BlockRoadTrafficLightGen(String unlocalizedName) { - super(unlocalizedName); - this.setDefaultState(this.getDefaultState().withProperty(POWERED, false).withProperty(CONTROL_MODE, - Mode.redstone_controlled)); - // setTickRandomly(true); - // this.setCreativeTab(null); - } - - @Override - public CreativeTabs getCreativeTabToDisplayOn() { - return null; - } - - /** - * Called when the block is right clicked by a player. - */ - @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, - EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - - if (worldIn.isRemote) { - return super.onBlockActivated(worldIn, pos, state, playerIn, hand, facing, hitX, hitY, hitZ); - } - if (!playerIn.capabilities.allowEdit) { - playerIn.sendMessage(new TextComponentTranslation("commands.generic.permission")); - return super.onBlockActivated(worldIn, pos, state, playerIn, hand, facing, hitX, hitY, hitZ); - } - ItemStack itemstack = playerIn.getHeldItem(hand); - - if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemWrench) { - - blockToggledInternal(worldIn, pos, state, playerIn); - - return true; - } else if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemTrafficRemote) { - - CommandTrafficLightsLightAdd.addLight(pos, playerIn, this, worldIn, state); - return true; - } - - return super.onBlockActivated(worldIn, pos, state, playerIn, hand, facing, hitX, hitY, hitZ); - - } - - @Override - public IBlockState getStateFromMeta(int meta) { - int facing = meta % 4; - int modeIndex = (meta - facing) / 4; - Mode mode = Mode.fromIndex(modeIndex); - if (!getLegalModes().contains(mode)) { - mode = getLegalModes().get(0); - } - return this.getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta % 4)) - .withProperty(CONTROL_MODE, mode); - } - - @Override - public int getMetaFromState(IBlockState state) { - return super.getMetaFromState(state) + getMode(state).index * 4; - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return super.getActualState(state, worldIn, pos).withProperty(CONTROL_MODE, getMode(state)); - } - - /** - * Called after the block is set in the Chunk data, but before the Tile Entity - * is set - */ - @Override - public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { - super.onBlockAdded(worldIn, pos, state); - if (worldIn.isRemote) { - return; - } - setPowered(worldIn, pos, state, isPowered(worldIn, pos)); // to prevent immediate change if - // lights are already powered before they are placed. - // updateStateInternal(worldIn, pos, state); - - if (!getLegalModes().contains(getMode(state))) { - setMode(worldIn, pos, state, getLegalModes().get(0)); - } - - int x = pos.getX(); - int y = pos.getY(); - int z = pos.getZ(); - worldIn.scheduleUpdate(new BlockPos(x, y, z), this, this.tickRate(worldIn)); - } - - /** - * Called when a neighboring block was changed and marks that this state should - * perform any checks during a neighbor change. Cases may include when redstone - * power is updated, cactus blocks popping off due to a neighboring solid block, - * etc. - */ - @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { - if (worldIn.isRemote) { - return; - } - if (!getSavedPowered(state) && isPowered(worldIn, pos)) { - updateStateInternal(true, worldIn, pos, state); - } else { - setPowered(worldIn, pos, state, isPowered(worldIn, pos)); - worldIn.scheduleUpdate(pos, this, 4); - } - } - - @Override - public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { - super.updateTick(worldIn, pos, state, rand); - - if (!isPlaced(worldIn, pos)) { - return; - } - if (worldIn.isRemote) { - return; - } - boolean updated = !getSavedPowered(state) && isPowered(worldIn, pos); - updateStateInternal(updated, worldIn, pos, state); - - setPowered(worldIn, pos, state, isPowered(worldIn, pos)); - - int x = pos.getX(); - int y = pos.getY(); - int z = pos.getZ(); - worldIn.scheduleUpdate(new BlockPos(x, y, z), this, this.tickRate(worldIn)); - } - - private void updateStateInternal(boolean updated, World worldIn, BlockPos pos, IBlockState state) { - if (worldIn.isRemote) { - return; - } - if (!isPlaced(worldIn, pos)) { - return; - } - setPowered(worldIn, pos, state, isPowered(worldIn, pos)); - if (getMode(state) != Mode.redstone_controlled) { - return; - } - updateState(updated, worldIn, pos, state); - } - /* - * { if (worldIn.isRemote) { System.out.println("Returning"); return; } - * - * if (activated) { System.out.println("State:" + this.state.name()); switch - * (this.state) { case Green: if (worldIn.isBlockPowered(pos)) { - * setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_yellow); - * this.state = COLOR.Yellow; lastTransitionTime = worldIn.getTotalWorldTime(); - * } break; case Yellow: System.out.println("Total:" + - * worldIn.getTotalWorldTime()); System.out.println("Last:" + - * lastTransitionTime); if (worldIn.isBlockPowered(pos) || - * worldIn.getTotalWorldTime() - lastTransitionTime >= YELLOW_DURATION) { - * setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_red); - * this.state = COLOR.Red; lastTransitionTime = 0; } break; case Red: if - * (worldIn.isBlockPowered(pos)) { setBlockState(worldIn, pos, state, - * RoadBlocks.road_traffic_light_green); this.state = COLOR.Green; - * lastTransitionTime = 0; } break; } } else { if (!force && - * worldIn.getTotalWorldTime() - lastTransitionTime < BLINKING_INTERVAL) { - * return; } if (yellowOn) { setBlockState(worldIn, pos, state, - * RoadBlocks.road_traffic_light_off); lastTransitionTime = - * worldIn.getTotalWorldTime(); yellowOn = false; } else { - * setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_yellow); - * lastTransitionTime = worldIn.getTotalWorldTime(); yellowOn = true; } - * - * } - * - * } - */ - - protected abstract void updateState(boolean updated, World worldIn, BlockPos pos, - IBlockState state);/* - * - * protected abstract void setBlockState(World worldIn, BlockPos pos, - * IBlockState state, Block blockTexture);/* { worldIn.setBlockState(pos, - * blockTexture.getDefaultState().withProperty(FACING, state.getValue(FACING)), - * 2); } - * - */ - - protected void blockToggledInternal(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) { - if (worldIn.isRemote) { - return; - } - if (!isPlaced(worldIn, pos)) { - return; - } - switch (getMode(state)) { - case redstone_controlled: - setMode(worldIn, pos, state, Mode.command_controlled, player); - setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_green_dyn, Mode.command_controlled); - break; - case command_controlled: - setMode(worldIn, pos, state, Mode.deactivated, player); - setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_yellow_blinking, Mode.deactivated); - break; - case deactivated: - setMode(worldIn, pos, state, Mode.redstone_controlled, player); - setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_green_dyn, Mode.redstone_controlled); - break; - } - - } - - public final void setBlockState(World worldIn, BlockPos pos, IBlockState state, Block blockTexture) { - setBlockState(worldIn, pos, state, blockTexture, getMode(state)); - } - - public final void setBlockState(World worldIn, BlockPos pos, IBlockState state, Block blockTexture, Mode mode) { - if (this.equals(blockTexture)) { - return; - } - worldIn.setBlockState(pos, blockTexture.getDefaultState().withProperty(FACING, state.getValue(FACING)) - .withProperty(CONTROL_MODE, mode), 2); - } - - protected final void setPowered(World worldIn, BlockPos pos, IBlockState state, boolean powered) { - if (powered == getSavedPowered(state)) { - return; - } - worldIn.setBlockState(pos, this.getActualState(state, worldIn, pos).withProperty(POWERED, powered), 2); - } - - protected final boolean getSavedPowered(IBlockState state) { - return state.getValue(POWERED); - } - - public void setMode(World worldIn, BlockPos pos, IBlockState state, Mode mode) { - setMode(worldIn, pos, state, mode, null); - } - - public void setMode(World worldIn, BlockPos pos, IBlockState state, Mode mode, @Nullable EntityPlayer player) { - if (mode == getMode(state)) { - return; - } - worldIn.setBlockState(pos, this.getActualState(state, worldIn, pos).withProperty(CONTROL_MODE, mode), 2); - - if (player != null) { // if not null, it has just been toggled by player - switch (mode) { - case redstone_controlled: - player.sendMessage(new TextComponentTranslation("dfroads.trafficlight.mode.redstone_controlled")); - break; - case command_controlled: - player.sendMessage(new TextComponentTranslation("dfroads.trafficlight.mode.command_controlled")); - break; - case deactivated: - player.sendMessage(new TextComponentTranslation("dfroads.trafficlight.mode.deactivated")); - break; - } - if (LightsSetList.get(worldIn).lightAlreadyUsed(pos) && mode != Mode.command_controlled) { - player.sendMessage(new TextComponentTranslation("dfroads.trafficlight.mode.deprecated")); - } - - } - - } - - public Mode getMode(IBlockState state) { - return state.getValue(CONTROL_MODE); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, FACING, UP, DOWN, NORTH, SOUTH, EAST, WEST, POWERED, CONTROL_MODE); - } - - /** - * Get the Item that this Block should drop when harvested. - */ - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(RoadBlocks.road_traffic_light_manual); - } - - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(RoadBlocks.road_traffic_light_manual); - } - - @Override - protected ItemStack getSilkTouchDrop(IBlockState state) { - return new ItemStack(RoadBlocks.road_traffic_light_manual); - } - - protected boolean isPlaced(World worldIn, BlockPos pos) { - return worldIn.getBlockState(pos).getBlock().equals(this); - } - - protected boolean isPowered(World worldIn, BlockPos pos) { - return isPlaced(worldIn, pos) && worldIn.isBlockPowered(pos); - } - -} diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightGreen.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightGreen.java index 5b1448e..254282e 100644 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightGreen.java +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightGreen.java @@ -1,26 +1,38 @@ package derfl007.roads.common.blocks.trafficlights; -import derfl007.roads.init.RoadBlocks; +import derfl007.roads.trafficlights.YellowLightsStartTimes; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockRoadTrafficLightGreen extends BlockRoadTrafficLightGen { +public class BlockRoadTrafficLightGreen extends BlockRoadTrafficLightBase { public BlockRoadTrafficLightGreen() { super("road_traffic_light_green_dyn"); } @Override - protected void updateState(boolean updated, World worldIn, BlockPos pos, IBlockState state) { - if (updated) { - setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_yellow_dyn); - } + protected void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state) { + setLightsState(worldIn, pos, LightsState.YELLOW); } - + + @Override - protected void blockToggled(World worldIn, BlockPos pos, IBlockState state) { - setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_yellow_blinking); + public LightsState getState() { + // TODO Auto-generated method stub + return LightsState.GREEN; } + @Override + protected void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + + } + + @Override + public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { + super.onBlockAdded(worldIn, pos, state); + YellowLightsStartTimes addedTimes = YellowLightsStartTimes.get(worldIn); + addedTimes.removeAddedTime(pos); + } } diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightRed.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightRed.java index 4f5ce8b..972727c 100644 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightRed.java +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightRed.java @@ -1,34 +1,30 @@ package derfl007.roads.common.blocks.trafficlights; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import derfl007.roads.init.RoadBlocks; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockRoadTrafficLightRed extends BlockRoadTrafficLightGen { +public class BlockRoadTrafficLightRed extends BlockRoadTrafficLightBase { public BlockRoadTrafficLightRed() { super("road_traffic_light_red_dyn"); } @Override - protected void updateState(boolean updated, World worldIn, BlockPos pos, IBlockState state) { - if (updated) { - setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_green_dyn); - } + protected void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state) { + } @Override - public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { - super.onBlockAdded(worldIn, pos, state); + public LightsState getState() { + // TODO Auto-generated method stub + return LightsState.RED; } + @Override - protected List getLegalModes() { - return new ArrayList(Arrays.asList(Mode.redstone_controlled, Mode.command_controlled)); + protected void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + setLightsState(worldIn, pos, LightsState.GREEN); } } diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightYellow.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightYellow.java index d695ad3..97e5c8c 100644 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightYellow.java +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/BlockRoadTrafficLightYellow.java @@ -1,44 +1,70 @@ package derfl007.roads.common.blocks.trafficlights; -import java.util.HashMap; -import java.util.Map; +import java.util.Random; -import derfl007.roads.init.RoadBlocks; +import derfl007.roads.Reference; +import derfl007.roads.trafficlights.YellowLightsStartTimes; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockRoadTrafficLightYellow extends BlockRoadTrafficLightGen { - - private Map addedTimes = new HashMap<>(); +public class BlockRoadTrafficLightYellow extends BlockRoadTrafficLightBase { public BlockRoadTrafficLightYellow() { super("road_traffic_light_yellow_dyn"); } @Override - protected void updateState(boolean updated, World worldIn, BlockPos pos, IBlockState state) { - if (!addedTimes.containsKey(pos)) { - System.out.println("new:" + pos.toString()); - addedTimes.put(pos, worldIn.getTotalWorldTime()); + protected void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state) { + + } + + @Override + public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { + super.updateTick(worldIn, pos, state, rand); + + if (!isPlaced(worldIn, pos)) { + return; } - if (addedTimes.get(pos) > 0 && worldIn.getTotalWorldTime() - addedTimes.get(pos) >= YELLOW_DURATION) { - setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_red_dyn); + if (getMode(state) == TrafficLightsControlMode.redstone_controlled) { + YellowLightsStartTimes addedTimes = YellowLightsStartTimes.get(worldIn); + + if (worldIn.getTotalWorldTime() - addedTimes.getAddedTime(worldIn, pos) > DEFAULT_YELLOW_DURATION + * Reference.TICK_RATE) { + setLightsState(worldIn, pos, LightsState.RED); + } else { + worldIn.scheduleUpdate(pos, this, 4); + } } } @Override public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { super.onBlockAdded(worldIn, pos, state); - if (!addedTimes.containsKey(pos) || worldIn.getTotalWorldTime() - addedTimes.get(pos) > YELLOW_DURATION) { - addedTimes.put(pos, worldIn.getTotalWorldTime()); + + if (getMode(state) == TrafficLightsControlMode.redstone_controlled) { + YellowLightsStartTimes addedTimes = YellowLightsStartTimes.get(worldIn); + + if (worldIn.getTotalWorldTime() - addedTimes.getAddedTime(worldIn, pos) > DEFAULT_YELLOW_DURATION + * Reference.TICK_RATE) { + addedTimes.updateAddedTime(worldIn, pos); + } + worldIn.scheduleUpdate(pos, this, 4); } + + } + + @Override + public LightsState getState() { + // TODO Auto-generated method stub + return LightsState.YELLOW; } @Override - protected void blockToggled(World worldIn, BlockPos pos, IBlockState state) { - setBlockState(worldIn, pos, state, RoadBlocks.road_traffic_light_yellow_blinking); + protected void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + setLightsState(worldIn, pos, LightsState.GREEN); } } diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLight.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLight.java index 323af1d..184e13d 100644 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLight.java +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLight.java @@ -1,26 +1,43 @@ package derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights; -import derfl007.roads.common.blocks.BlockRoadSign; -import derfl007.roads.init.RoadBlocks; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.properties.PropertyDirection; +import derfl007.roads.Roads; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockRoadPedestrianTrafficLight extends BlockRoadSign { - - public static final PropertyDirection FACING = BlockHorizontal.FACING; - +public class BlockRoadPedestrianTrafficLight extends BlockRoadPedestrianTrafficLightBase { + public BlockRoadPedestrianTrafficLight(){ super("road_pedestrian_traffic_light_manual"); } + + @Override + public CreativeTabs getCreativeTabToDisplayOn() { + return Roads.SIGNS_TAB; + } @Override public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { - super.onBlockAdded(worldIn, pos, state); - worldIn.setBlockState(pos, RoadBlocks.road_pedestrian_traffic_light_green.getDefaultState().withProperty(FACING, state.getValue(FACING)), 2); + setLightsState(worldIn, pos, LightsState.GREEN); + } + + @Override + public LightsState getState() { + // TODO Auto-generated method stub + return LightsState.GREEN; //for item rendering + } + + @Override + protected void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + + } + + @Override + protected void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + } } diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightBase.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightBase.java new file mode 100644 index 0000000..2de433e --- /dev/null +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightBase.java @@ -0,0 +1,60 @@ +package derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights; + +import java.util.Random; + +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; +import derfl007.roads.init.RoadBlocks; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public abstract class BlockRoadPedestrianTrafficLightBase extends BlockRoadTrafficLightBase { + + @Override + public boolean isPedestrianLights() { + return true; + } + + public BlockRoadPedestrianTrafficLightBase(String unlocalizedName) { + super(unlocalizedName); + // setTickRandomly(true); + // this.setCreativeTab(null); + } + + /** + * Get the Item that this Block should drop when harvested. + */ + @Override + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return Item.getItemFromBlock(RoadBlocks.road_pedestrian_traffic_light_manual); + } + + @Override + public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { + return new ItemStack(RoadBlocks.road_pedestrian_traffic_light_manual); + } + + @Override + protected ItemStack getSilkTouchDrop(IBlockState state) { + return new ItemStack(RoadBlocks.road_pedestrian_traffic_light_manual); + } + + @Override + protected Block getTextureForLightsState(LightsState state) { + switch (state) { + case GREEN: + return RoadBlocks.road_pedestrian_traffic_light_green; + case YELLOW: + case RED: + return RoadBlocks.road_pedestrian_traffic_light_red; + case DEACTIVATED: + return RoadBlocks.road_pedestrian_traffic_light_off; + default: + throw new IllegalArgumentException(); + } + } + +} diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightGen.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightGen.java deleted file mode 100644 index 7eee6da..0000000 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightGen.java +++ /dev/null @@ -1,70 +0,0 @@ -package derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights; - -import java.util.Random; - -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen; -import derfl007.roads.init.RoadBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public abstract class BlockRoadPedestrianTrafficLightGen extends BlockRoadTrafficLightGen { - - public BlockRoadPedestrianTrafficLightGen(String unlocalizedName) { - super(unlocalizedName); - // setTickRandomly(true); - // this.setCreativeTab(null); - } - - /** - * Get the Item that this Block should drop when harvested. - */ - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(RoadBlocks.road_pedestrian_traffic_light_manual); - } - - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(RoadBlocks.road_pedestrian_traffic_light_manual); - } - - @Override - protected ItemStack getSilkTouchDrop(IBlockState state) { - return new ItemStack(RoadBlocks.road_pedestrian_traffic_light_manual); - } - - @Override - protected void blockToggledInternal(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) { - if (worldIn.isRemote) { - return; - } - if (!isPlaced(worldIn, pos)) { - return; - } - if (player != null) { - switch (getMode(state)) { - case redstone_controlled: - setMode(worldIn, pos, state, Mode.command_controlled, player); - setBlockState(worldIn, pos, state, RoadBlocks.road_pedestrian_traffic_light_green, - Mode.command_controlled); - - break; - case command_controlled: - setMode(worldIn, pos, state, Mode.deactivated, player); - setBlockState(worldIn, pos, state, RoadBlocks.road_pedestrian_traffic_light_off, Mode.deactivated); - - break; - case deactivated: - setMode(worldIn, pos, state, Mode.redstone_controlled, player); - setBlockState(worldIn, pos, state, RoadBlocks.road_pedestrian_traffic_light_green, - Mode.redstone_controlled); - - } - } - } - -} diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightGreen.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightGreen.java index 72c79e0..8397c13 100644 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightGreen.java +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightGreen.java @@ -1,30 +1,30 @@ package derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import derfl007.roads.init.RoadBlocks; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockRoadPedestrianTrafficLightGreen extends BlockRoadPedestrianTrafficLightGen { +public class BlockRoadPedestrianTrafficLightGreen extends BlockRoadPedestrianTrafficLightBase { public BlockRoadPedestrianTrafficLightGreen() { super("road_pedestrian_traffic_light_green"); } @Override - protected void updateState(boolean updated, World worldIn, BlockPos pos, IBlockState state) { - if (updated) { - setBlockState(worldIn, pos, state, RoadBlocks.road_pedestrian_traffic_light_red); - } + protected void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state) { + setLightsState(worldIn, pos, LightsState.RED); } @Override - protected List getLegalModes() { - return new ArrayList(Arrays.asList(Mode.redstone_controlled, Mode.command_controlled)); + public LightsState getState() { + // TODO Auto-generated method stub + return LightsState.GREEN; + } + + @Override + protected void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + } } diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightOff.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightOff.java index 9a0d821..d1496f5 100644 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightOff.java +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightOff.java @@ -1,36 +1,34 @@ package derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockRoadPedestrianTrafficLightOff extends BlockRoadPedestrianTrafficLightGen { +public class BlockRoadPedestrianTrafficLightOff extends BlockRoadPedestrianTrafficLightBase { public BlockRoadPedestrianTrafficLightOff() { super("road_pedestrian_traffic_light_off"); - this.setDefaultState(this.getDefaultState().withProperty(CONTROL_MODE, Mode.deactivated)); + this.setDefaultState(this.getDefaultState().withProperty(CONTROL_MODE, TrafficLightsControlMode.deactivated)); + } + + @Override + protected void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state) { } @Override - protected void updateState(boolean updated, World worldIn, BlockPos pos, IBlockState state) { - return; + public LightsState getState() { + // TODO Auto-generated method stub + return LightsState.DEACTIVATED; } @Override - protected List getLegalModes() { - return new ArrayList(Arrays.asList(Mode.deactivated)); + public TrafficLightsControlMode getMode(IBlockState state) { + return TrafficLightsControlMode.deactivated; } - - /** - * Called after the block is set in the Chunk data, but before the Tile Entity - * is set - */ + @Override - public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { - setMode(worldIn, pos, state, Mode.deactivated); + protected void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + } } diff --git a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightRed.java b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightRed.java index a6c8bc2..6e112fb 100644 --- a/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightRed.java +++ b/src/main/java/derfl007/roads/common/blocks/trafficlights/pedestriantrafficlights/BlockRoadPedestrianTrafficLightRed.java @@ -1,30 +1,30 @@ package derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import derfl007.roads.init.RoadBlocks; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockRoadPedestrianTrafficLightRed extends BlockRoadPedestrianTrafficLightGen { +public class BlockRoadPedestrianTrafficLightRed extends BlockRoadPedestrianTrafficLightBase { public BlockRoadPedestrianTrafficLightRed() { super("road_pedestrian_traffic_light_red"); } @Override - protected void updateState(boolean updated, World worldIn, BlockPos pos, IBlockState state) { - if (updated) { - setBlockState(worldIn, pos, state, RoadBlocks.road_pedestrian_traffic_light_green); - } + protected void redstoneSignalReceived(World worldIn, BlockPos pos, IBlockState state) { + } - + + @Override + public LightsState getState() { + // TODO Auto-generated method stub + return LightsState.RED; + } + @Override - protected List getLegalModes() { - return new ArrayList(Arrays.asList(Mode.redstone_controlled, Mode.command_controlled)); + protected void redstoneSignalInterrupted(World worldIn, BlockPos pos, IBlockState state) { + // TODO Auto-generated method stub + setLightsState(worldIn, pos, LightsState.GREEN); } } diff --git a/src/main/java/derfl007/roads/common/commands/CommandTrafficLightsBase.java b/src/main/java/derfl007/roads/common/commands/CommandTrafficLightsBase.java index 2b99d75..e24df0f 100644 --- a/src/main/java/derfl007/roads/common/commands/CommandTrafficLightsBase.java +++ b/src/main/java/derfl007/roads/common/commands/CommandTrafficLightsBase.java @@ -49,13 +49,19 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args return; } if (args != null && expectedArgumentsCount() != args.length) { - unexpectedArguments(sender); - return; + if (args.length < expectedArgumentsCount() || !hasOptionalArguments()) { + unexpectedArguments(sender); + return; + } } execute(server, player, args); } + protected boolean hasOptionalArguments() { + return false; + } + protected abstract int expectedArgumentsCount(); public abstract void execute(MinecraftServer server, EntityPlayer player, String[] args) throws CommandException; diff --git a/src/main/java/derfl007/roads/common/commands/group/CommandTrafficLightsGroupFinish.java b/src/main/java/derfl007/roads/common/commands/group/CommandTrafficLightsGroupFinish.java index e7c76c6..4a143d4 100644 --- a/src/main/java/derfl007/roads/common/commands/group/CommandTrafficLightsGroupFinish.java +++ b/src/main/java/derfl007/roads/common/commands/group/CommandTrafficLightsGroupFinish.java @@ -1,5 +1,6 @@ package derfl007.roads.common.commands.group; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; import derfl007.roads.common.commands.CommandTrafficLights; import derfl007.roads.common.commands.CommandTrafficLightsBase; import derfl007.roads.trafficlights.LightsGroup; @@ -37,6 +38,10 @@ public void execute(MinecraftServer server, EntityPlayer player, String[] args) } int greenDuration = Integer.valueOf(args[0]); int delay = Integer.valueOf(args[1]); + int yellowDuration = BlockRoadTrafficLightBase.DEFAULT_YELLOW_DURATION; + if(args.length == 3) { + yellowDuration = Integer.valueOf(args[2]); + } if (greenDuration < 1 || delay < 0) { player.sendMessage(new TextComponentTranslation("command.trafficlights.group.invalidargs")); return; @@ -44,6 +49,7 @@ public void execute(MinecraftServer server, EntityPlayer player, String[] args) current.get(current.selectedGroupIndex).setGreenDuration(greenDuration); current.get(current.selectedGroupIndex).setDelay(delay); + current.get(current.selectedGroupIndex).setYellowDuration(yellowDuration); if (!current.get(current.size() - 1).getLights().isEmpty()) { current.add(new LightsGroup()); @@ -64,5 +70,11 @@ protected int expectedArgumentsCount() { // TODO Auto-generated method stub return 2; } + + @Override + protected boolean hasOptionalArguments() { + // TODO Auto-generated method stub + return true; + } } \ No newline at end of file diff --git a/src/main/java/derfl007/roads/common/commands/light/CommandTrafficLightsLightAdd.java b/src/main/java/derfl007/roads/common/commands/light/CommandTrafficLightsLightAdd.java index c15a0dc..4b8eff0 100644 --- a/src/main/java/derfl007/roads/common/commands/light/CommandTrafficLightsLightAdd.java +++ b/src/main/java/derfl007/roads/common/commands/light/CommandTrafficLightsLightAdd.java @@ -1,7 +1,7 @@ package derfl007.roads.common.commands.light; -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen; -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen.Mode; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase.TrafficLightsControlMode; import derfl007.roads.common.commands.CommandTrafficLights; import derfl007.roads.common.commands.CommandTrafficLightsBase; import derfl007.roads.trafficlights.LightsSetList; @@ -28,8 +28,8 @@ public String getUsage(ICommandSender sender) { } public static void addLight(BlockPos pos, EntityPlayer player) { - if (player.world.getBlockState(pos).getBlock() instanceof BlockRoadTrafficLightGen) { - BlockRoadTrafficLightGen block = (BlockRoadTrafficLightGen) player.world.getBlockState(pos).getBlock(); + if (player.world.getBlockState(pos).getBlock() instanceof BlockRoadTrafficLightBase) { + BlockRoadTrafficLightBase block = (BlockRoadTrafficLightBase) player.world.getBlockState(pos).getBlock(); addLight(pos, player, block, player.world, player.world.getBlockState(pos)); } else { player.sendMessage(new TextComponentTranslation("command.trafficlights.light.notalight", pos.getX(), @@ -37,10 +37,10 @@ public static void addLight(BlockPos pos, EntityPlayer player) { } } - public static void addLight(BlockPos pos, EntityPlayer player, BlockRoadTrafficLightGen block, World world, + public static void addLight(BlockPos pos, EntityPlayer player, BlockRoadTrafficLightBase block, World world, IBlockState state) { - if (block.getMode(state) != Mode.command_controlled) { + if (block.getMode(state) != TrafficLightsControlMode.command_controlled) { player.sendMessage(new TextComponentTranslation("command.trafficlights.light.invalidmode")); return; } diff --git a/src/main/java/derfl007/roads/common/commands/set/CommandTrafficLightsSetCheck.java b/src/main/java/derfl007/roads/common/commands/set/CommandTrafficLightsSetCheck.java index d468b49..87bd93f 100644 --- a/src/main/java/derfl007/roads/common/commands/set/CommandTrafficLightsSetCheck.java +++ b/src/main/java/derfl007/roads/common/commands/set/CommandTrafficLightsSetCheck.java @@ -1,7 +1,7 @@ package derfl007.roads.common.commands.set; -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen; -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen.Mode; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase.TrafficLightsControlMode; import derfl007.roads.common.commands.CommandTrafficLights; import derfl007.roads.common.commands.CommandTrafficLightsBase; import derfl007.roads.trafficlights.LightsGroup; @@ -55,36 +55,36 @@ public static void showInfo(String name, LightsSet set, EntityPlayer player) { for (LightsGroup group : set) { if (selected == i - 1) { - state = state + "\n§9§l---" + getLocalizedString("dfroads.partial.group", TextFormatting.BLUE, i) + " " + state = state + "\n§9§l---" + getLocalizedString("dfroads.partial.group", TextFormatting.BLUE, i) + " " + getLocalizedString("dfroads.partial.current", TextFormatting.BLUE) + " " + getLocalizedString("dfroads.partial.groupprop", TextFormatting.BLUE, group.getGreenDuration(), group.getDelay()); } else { - state = state + "\n§r---" + getLocalizedString("dfroads.partial.group", i) + " " - + getLocalizedString("dfroads.partial.groupprop", group.getGreenDuration(), group.getDelay()); + state = state + "\n§r---" + getLocalizedString("dfroads.partial.group", i) + " " + + getLocalizedString("dfroads.partial.groupprop", group.getGreenDuration(), group.getYellowDuration(), group.getDelay()); } for (BlockPos pos : group.getLights()) { String posString = String.format("x=%d, y=%d, z=%d", pos.getX(), pos.getY(), pos.getZ()); - if (player.world.getBlockState(pos).getBlock() instanceof BlockRoadTrafficLightGen) { + if (player.world.getBlockState(pos).getBlock() instanceof BlockRoadTrafficLightBase) { - BlockRoadTrafficLightGen block = (BlockRoadTrafficLightGen) player.world.getBlockState(pos) + BlockRoadTrafficLightBase block = (BlockRoadTrafficLightBase) player.world.getBlockState(pos) .getBlock(); - if (block.getMode(player.world.getBlockState(pos)) == Mode.command_controlled) { + if (block.getMode(player.world.getBlockState(pos)) == TrafficLightsControlMode.command_controlled) { if (LightsSetList.get(player.world).isDuplicated(pos)) { - state = state + "\n§r------§m" + posString + "§r §6" + state = state + "\n§r------§m" + posString + "§r §6" + getLocalizedString("dfroads.partial.duplicated"); } else { - state = state + "\n§r------" + posString + " §a" + getLocalizedString("dfroads.partial.ok"); + state = state + "\n§r------" + posString + "§a" + getLocalizedString("dfroads.partial.ok"); } } else { - state = state + "\n§r------§m" + posString + "§r §6" + state = state + "\n§r------§m" + posString + "§r §6" + getLocalizedString("dfroads.partial.illegalmode"); } } else { - state = state + "\n§r------§m" + posString + "§r §4" + state = state + "\n§r------§m" + posString + "§r §4" + getLocalizedString("dfroads.partial.destroyed"); } } diff --git a/src/main/java/derfl007/roads/common/items/ItemColorCartridge.java b/src/main/java/derfl007/roads/common/items/ItemColorCartridge.java index fad7b88..ac92d81 100644 --- a/src/main/java/derfl007/roads/common/items/ItemColorCartridge.java +++ b/src/main/java/derfl007/roads/common/items/ItemColorCartridge.java @@ -1,14 +1,14 @@ package derfl007.roads.common.items; +import java.text.DecimalFormat; +import java.util.List; + import derfl007.roads.Roads; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import java.text.DecimalFormat; -import java.util.List; - public class ItemColorCartridge extends Item { public ItemColorCartridge(String name) { this.setRegistryName(name); diff --git a/src/main/java/derfl007/roads/common/tileentities/TileEntityRoadLantern.java b/src/main/java/derfl007/roads/common/tileentities/TileEntityRoadLantern.java index e74548b..7d8a5a0 100644 --- a/src/main/java/derfl007/roads/common/tileentities/TileEntityRoadLantern.java +++ b/src/main/java/derfl007/roads/common/tileentities/TileEntityRoadLantern.java @@ -4,7 +4,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ITickable; -import net.minecraft.world.border.IBorderListener; public class TileEntityRoadLantern extends TileEntity implements ITickable { diff --git a/src/main/java/derfl007/roads/common/tileentities/TileEntityRoadTownSign.java b/src/main/java/derfl007/roads/common/tileentities/TileEntityRoadTownSign.java index b15865b..4f849b9 100644 --- a/src/main/java/derfl007/roads/common/tileentities/TileEntityRoadTownSign.java +++ b/src/main/java/derfl007/roads/common/tileentities/TileEntityRoadTownSign.java @@ -7,51 +7,50 @@ public class TileEntityRoadTownSign extends TileEntity { - private String message = null; + private String message = null; - @Override - public boolean hasFastRenderer() { - return true; - } + @Override + public boolean hasFastRenderer() { + return true; + } - public String getMessage() { + public String getMessage() { // System.out.println("get message: " + message); - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - @Override - public void readFromNBT(NBTTagCompound tagCompound) { - super.readFromNBT(tagCompound); - this.message = tagCompound.getString("message"); - } - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { - super.writeToNBT(tagCompound); - if(this.message != null) - { - tagCompound.setString("message", this.message); - } - return tagCompound; - } - - @Override - public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + @Override + public void readFromNBT(NBTTagCompound tagCompound) { + super.readFromNBT(tagCompound); + this.message = tagCompound.getString("message"); + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { + tagCompound = super.writeToNBT(tagCompound); + if (this.message != null) { + tagCompound.setString("message", this.message); + } + return tagCompound; + } + + @Override + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { // System.out.println("message received by te: " + pkt.getNbtCompound().getString("message")); - this.readFromNBT(pkt.getNbtCompound()); - } - - @Override - public SPacketUpdateTileEntity getUpdatePacket() { - return new SPacketUpdateTileEntity(pos, getBlockMetadata(), this.writeToNBT(new NBTTagCompound())); - } - - @Override - public NBTTagCompound getUpdateTag() { - return this.writeToNBT(new NBTTagCompound()); - } + this.readFromNBT(pkt.getNbtCompound()); + } + + @Override + public SPacketUpdateTileEntity getUpdatePacket() { + return new SPacketUpdateTileEntity(pos, getBlockMetadata(), this.writeToNBT(new NBTTagCompound())); + } + + @Override + public NBTTagCompound getUpdateTag() { + return this.writeToNBT(new NBTTagCompound()); + } } \ No newline at end of file diff --git a/src/main/java/derfl007/roads/common/tileentities/TileEntitySignPrinter.java b/src/main/java/derfl007/roads/common/tileentities/TileEntitySignPrinter.java index bafada4..0c78c6c 100644 --- a/src/main/java/derfl007/roads/common/tileentities/TileEntitySignPrinter.java +++ b/src/main/java/derfl007/roads/common/tileentities/TileEntitySignPrinter.java @@ -11,17 +11,13 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ItemStackHelper; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityLockable; import net.minecraft.util.NonNullList; -import static derfl007.roads.init.RoadBlocks.*; - public class TileEntitySignPrinter extends TileEntityLockable implements IInventory { protected NonNullList inventory; diff --git a/src/main/java/derfl007/roads/common/util/BlockStateUtil.java b/src/main/java/derfl007/roads/common/util/BlockStateUtil.java new file mode 100644 index 0000000..4fb0fbe --- /dev/null +++ b/src/main/java/derfl007/roads/common/util/BlockStateUtil.java @@ -0,0 +1,60 @@ +package derfl007.roads.common.util; + +import java.util.Optional; + +import derfl007.roads.common.blocks.IBlockConnectable; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; + +public final class BlockStateUtil { + + public static IExtendedBlockState getExtendedState(IBlockConnectable block, IBlockState state, IBlockAccess worldIn, + BlockPos pos) { + return ((IExtendedBlockState) state).withProperty(IBlockConnectable.UP, block.canConnectTo(worldIn, state, pos, EnumFacing.UP)) + .withProperty(IBlockConnectable.DOWN, block.canConnectTo(worldIn, state, pos, EnumFacing.DOWN)) + .withProperty(IBlockConnectable.NORTH, block.canConnectTo(worldIn, state, pos, EnumFacing.NORTH)) + .withProperty(IBlockConnectable.SOUTH, block.canConnectTo(worldIn, state, pos, EnumFacing.SOUTH)) + .withProperty(IBlockConnectable.EAST, block.canConnectTo(worldIn, state, pos, EnumFacing.EAST)) + .withProperty(IBlockConnectable.WEST, block.canConnectTo(worldIn, state, pos, EnumFacing.WEST)); + } + + @Deprecated + private BlockStateUtil() { + + } + + public static > T optGetValue(IBlockState state, IProperty property, T fallbackValue) { + try { + Comparable value = state.getProperties().get(property); + if (value == null) { + return fallbackValue; + } + + return property.getValueClass().cast(value); + + } catch (NullPointerException | IllegalArgumentException ex) { + return fallbackValue; + } + } + + public static > T optGetValue(IExtendedBlockState state, IUnlistedProperty property, + T fallbackValue) { + try { + Optional value = state.getUnlistedProperties().get(property); + if (value == null || !value.isPresent()) { + return fallbackValue; + } + + return property.getType().cast(value.get()); + + } catch (NullPointerException | IllegalArgumentException ex) { + return fallbackValue; + } + } + +} diff --git a/src/main/java/derfl007/roads/common/util/SignOrientation.java b/src/main/java/derfl007/roads/common/util/SignOrientation.java new file mode 100644 index 0000000..0264335 --- /dev/null +++ b/src/main/java/derfl007/roads/common/util/SignOrientation.java @@ -0,0 +1,98 @@ +package derfl007.roads.common.util; + +import net.minecraft.util.EnumFacing; + +public final class SignOrientation { + + /*** + * @deprecated Utility class should not be instantiated. + */ + @Deprecated + private SignOrientation() { + } + + public static final int WEST = 4; + public static final int NORTH = 8; + public static final int EAST = 12; + public static final int SOUTH = 0; + + // Strange order to keep facing compatibility with older versions. + private static final int[] orientations = { SOUTH, WEST, NORTH, EAST, 1, 2, 3, 5, 6, 7, 9, 10, 11, 13, 14, 15 }; + private static final int[] metadata = { 0, 4, 5, 6, 1, 7, 8, 9, 2, 10, 11, 12, 3, 13, 14, 15 }; + + public static int toMetadata(int rotation) { + + if (rotation < 0 || rotation > 15) { + throw new IllegalArgumentException(); + } + + return metadata[rotation]; + + } + + public static int fromMetadata(int metadata) { + + if (metadata < 0 || metadata > 15) { + return SOUTH; + } + return orientations[metadata]; + } + + public static float toAngle(int rotation) { + return -22.5F * rotation; + } + + public static EnumFacing toFacing(int rotation) { + switch (rotation) { + case 0: + case 1: + case 2: + case 15: + return EnumFacing.SOUTH; + + case 3: + case 4: + case 5: + case 6: + return EnumFacing.EAST; + + case 7: + case 8: + case 9: + case 10: + return EnumFacing.NORTH; + + case 11: + case 12: + case 13: + case 14: + return EnumFacing.WEST; + } + + throw new IllegalArgumentException(); + } + + public static boolean intersects(int rotation, EnumFacing direction) { + if (rotation < 0 || rotation > 15) { + throw new IllegalArgumentException(); + } + + switch (direction) { + case SOUTH: + return rotation > EAST || rotation < WEST; + + case EAST: + return rotation > NORTH; + + case NORTH: + return rotation > WEST && rotation < EAST; + + case WEST: + return rotation < NORTH; + + default: + return false; + } + } + +} diff --git a/src/main/java/derfl007/roads/common/util/UnlistedPropertyBoolean.java b/src/main/java/derfl007/roads/common/util/UnlistedPropertyBoolean.java new file mode 100644 index 0000000..69a76f0 --- /dev/null +++ b/src/main/java/derfl007/roads/common/util/UnlistedPropertyBoolean.java @@ -0,0 +1,37 @@ +package derfl007.roads.common.util; + +import net.minecraftforge.common.property.IUnlistedProperty; + +public class UnlistedPropertyBoolean implements IUnlistedProperty { + + private final String name; + + public UnlistedPropertyBoolean(String name) { + this.name = name; + } + + @Override + public String getName() { + // TODO Auto-generated method stub + return name; + } + + @Override + public boolean isValid(Boolean value) { + // TODO Auto-generated method stub + return true; + } + + @Override + public Class getType() { + // TODO Auto-generated method stub + return Boolean.class; + } + + @Override + public String valueToString(Boolean value) { + // TODO Auto-generated method stub + return String.valueOf(value); + } + +} diff --git a/src/main/java/derfl007/roads/common/util/UnlistedPropertyEnum.java b/src/main/java/derfl007/roads/common/util/UnlistedPropertyEnum.java new file mode 100644 index 0000000..1f0326d --- /dev/null +++ b/src/main/java/derfl007/roads/common/util/UnlistedPropertyEnum.java @@ -0,0 +1,43 @@ +package derfl007.roads.common.util; + +import net.minecraftforge.common.property.IUnlistedProperty; + +public class UnlistedPropertyEnum> implements IUnlistedProperty { + + private final String name; + private final Class instance; + + public static > UnlistedPropertyEnum create(String name, Class instance) { + return new UnlistedPropertyEnum(name, instance); + } + + private UnlistedPropertyEnum(String name, Class instance) { + this.name = name; + this.instance = instance; + } + + @Override + public String getName() { + // TODO Auto-generated method stub + return name; + } + + @Override + public boolean isValid(T value) { + // TODO Auto-generated method stub + return true; + } + + @Override + public Class getType() { + // TODO Auto-generated method stub + return instance; + } + + @Override + public String valueToString(T value) { + // TODO Auto-generated method stub + return value.name(); + } + +} diff --git a/src/main/java/derfl007/roads/common/util/UnlistedPropertyInteger.java b/src/main/java/derfl007/roads/common/util/UnlistedPropertyInteger.java new file mode 100644 index 0000000..1be0808 --- /dev/null +++ b/src/main/java/derfl007/roads/common/util/UnlistedPropertyInteger.java @@ -0,0 +1,42 @@ +package derfl007.roads.common.util; + +import net.minecraftforge.common.property.IUnlistedProperty; + +public class UnlistedPropertyInteger implements IUnlistedProperty { + + private final int minValue; + private final int maxValue; + + private final String name; + + public UnlistedPropertyInteger(String name, int minValue, int maxValue) { + this.name = name; + this.minValue = minValue; + this.maxValue = maxValue; + } + + @Override + public String getName() { + // TODO Auto-generated method stub + return name; + } + + @Override + public boolean isValid(Integer value) { + // TODO Auto-generated method stub + return value >= minValue && value <= maxValue; + } + + @Override + public Class getType() { + // TODO Auto-generated method stub + return Integer.class; + } + + @Override + public String valueToString(Integer value) { + // TODO Auto-generated method stub + return String.valueOf(value); + } + +} diff --git a/src/main/java/derfl007/roads/gui/GuiHandler.java b/src/main/java/derfl007/roads/gui/GuiHandler.java index 4994bb7..b342693 100644 --- a/src/main/java/derfl007/roads/gui/GuiHandler.java +++ b/src/main/java/derfl007/roads/gui/GuiHandler.java @@ -4,7 +4,6 @@ import derfl007.roads.common.tileentities.TileEntitySignPrinter; import derfl007.roads.gui.containers.ContainerSignPrinter; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/derfl007/roads/gui/GuiRoadTownSign.java b/src/main/java/derfl007/roads/gui/GuiRoadTownSign.java index d0ea95b..00155a8 100644 --- a/src/main/java/derfl007/roads/gui/GuiRoadTownSign.java +++ b/src/main/java/derfl007/roads/gui/GuiRoadTownSign.java @@ -1,14 +1,15 @@ package derfl007.roads.gui; +import java.io.IOException; + +import org.lwjgl.input.Keyboard; + import derfl007.roads.network.PacketHandler; import derfl007.roads.network.message.MessageRoadTownSign; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.resources.I18n; -import org.lwjgl.input.Keyboard; - -import java.io.IOException; public class GuiRoadTownSign extends GuiScreen { diff --git a/src/main/java/derfl007/roads/gui/GuiSignPrinter.java b/src/main/java/derfl007/roads/gui/GuiSignPrinter.java index faf95b1..e84001e 100644 --- a/src/main/java/derfl007/roads/gui/GuiSignPrinter.java +++ b/src/main/java/derfl007/roads/gui/GuiSignPrinter.java @@ -1,5 +1,8 @@ package derfl007.roads.gui; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import derfl007.roads.RecipesSign; import derfl007.roads.common.tileentities.TileEntitySignPrinter; import derfl007.roads.gui.containers.ContainerSignPrinter; @@ -12,12 +15,9 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; public class GuiSignPrinter extends GuiContainer { diff --git a/src/main/java/derfl007/roads/init/RoadBlocks.java b/src/main/java/derfl007/roads/init/RoadBlocks.java index eeba08e..3ebb62e 100644 --- a/src/main/java/derfl007/roads/init/RoadBlocks.java +++ b/src/main/java/derfl007/roads/init/RoadBlocks.java @@ -3,16 +3,17 @@ import java.util.LinkedList; import java.util.List; -import derfl007.roads.Roads; import derfl007.roads.common.blocks.BlockAsphalt; +import derfl007.roads.common.blocks.BlockRoad; import derfl007.roads.common.blocks.BlockRoadGuardrail; import derfl007.roads.common.blocks.BlockRoadLantern; import derfl007.roads.common.blocks.BlockRoadLine; import derfl007.roads.common.blocks.BlockRoadLines; -import derfl007.roads.common.blocks.BlockRoadRotatable; +import derfl007.roads.common.blocks.BlockRoadMarker; import derfl007.roads.common.blocks.BlockRoadSidewalk; -import derfl007.roads.common.blocks.BlockRoadSign; +import derfl007.roads.common.blocks.BlockRoadSignLegacy; import derfl007.roads.common.blocks.BlockRoadSignPost; +import derfl007.roads.common.blocks.BlockRoadSignRotatable; import derfl007.roads.common.blocks.BlockRoadTownSign; import derfl007.roads.common.blocks.BlockSignPrinter; import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLight; @@ -24,11 +25,13 @@ import derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights.BlockRoadPedestrianTrafficLightGreen; import derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights.BlockRoadPedestrianTrafficLightOff; import derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights.BlockRoadPedestrianTrafficLightRed; +import derfl007.roads.models.RoadSignModelLoader; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -37,18 +40,14 @@ public class RoadBlocks { - public static Block asphalt, // Asphalt Block - road, // Road Block - + public static Block[] road, // Road Block road_white, // White block road_white_half, // Half white block road_white_quarter, // Quarter white block road_line, // Single line road_line_simple, // Single line (not connecting) road_line_merge, // Merge single and double lines - road_line_double, // Double Line road_line_double_simple, // Double Line (not connecting) - road_line_half_double, // Half double line road_line_half_double_simple, // Half double line (not connecting) road_line_diagonal, // Diagonal Line road_arrow_s, // straight arrow @@ -70,15 +69,18 @@ public class RoadBlocks { road_excl_zone_split_out_r, // road_excl_zone_split_out_l, // + road_line_double, // Double Line + road_line_double_yellow, // Double Line + road_line_half_double, // Half double line + road_line_half_double_yellow, // Half double line + road_yellow, // White block road_white_half_yellow, // Half white block road_white_quarter_yellow, // Quarter white block road_line_yellow, // Single line road_line_simple_yellow, // Single line (not connecting) road_line_merge_yellow, // Merge single and double lines - road_line_double_yellow, // Double Line road_line_double_simple_yellow, // Double Line (not connecting) - road_line_half_double_yellow, // Half double line road_line_half_double_simple_yellow, // Half double line (not connecting) road_line_diagonal_yellow, // Diagonal Line road_arrow_s_yellow, // straight arrow @@ -98,11 +100,14 @@ public class RoadBlocks { road_excl_zone_split_in_r_yellow, // road_excl_zone_split_in_l_yellow, // road_excl_zone_split_out_r_yellow, // - road_excl_zone_split_out_l_yellow, // + road_excl_zone_split_out_l_yellow; // + + public static Block asphalt, // Asphalt Block road_sidewalk, // Sidewalk road_guardrail, // Guardrail road_sign_post, // Sign Post + road_junction_marker, road_sign_prohib_1, // closed in both directions for all vehicles road_sign_prohib_2, // no entry @@ -216,18 +221,33 @@ public class RoadBlocks { road_sign_info_17b, // end of town sign road_sign_info_23, // two lanes merge into one road_sign_info_23b, // two lanes merge into one (german) + road_sign_info_24, // cut across + road_sign_info_25a, // curve left + road_sign_info_25b, // curve right + road_sign_info_26a, // no oncoming traffic + road_sign_info_26b, // two lanes + road_sign_info_26c, // three lanes + road_sign_info_27a, // left lane merging (two lanes) + road_sign_info_27b, // left lane merging (three lanes) + road_sign_info_27c, // left lane merging (four lanes) + road_sign_info_28a, // choose direction (two lanes) + road_sign_info_28b, // choose direction (three lanes) + + road_sign_meta_1, // reminder (French) + road_sign_meta_2a, // 50 m ahead + road_sign_meta_2b, // 100 m ahead + road_sign_meta_2c, // 150 m ahead + road_sign_meta_2d, // 300 m ahead + road_sign_meta_2e, // 500 m ahead road_lantern, // Road Lantern unlit road_lantern_lit, // Road Lantern lit road_traffic_light, // Traffic Light (Auto animated) - road_traffic_light_manual, // Traffic Light (Can be switched) - road_traffic_light_yellow_fixed, // Traffic Light (Yellow) (fixed) - road_traffic_light_red, // Traffic Light (Red) (Cannot be switched) - road_traffic_light_red_dyn,// Traffic Light (Red) - road_traffic_light_green, // Traffic Light (Green) (Cannot be switched) - road_traffic_light_green_dyn,// Traffic Light (Green) - road_traffic_light_yellow_dyn, // Traffic Light (Yellow) (Switching to red) + road_traffic_light_manual, // Traffic Light + road_traffic_light_red, // Traffic Light (Red) + road_traffic_light_green, // Traffic Light (Green) + road_traffic_light_yellow, // Traffic Light (Yellow) road_traffic_light_yellow_blinking, // Traffic Light (Yellow blinking) // road_traffic_light_off, @@ -239,246 +259,311 @@ public class RoadBlocks { public static void init() { asphalt = new BlockAsphalt("asphalt"); - road = new BlockRoadRotatable("road"); + road = BlockRoad.create("road"); // white road blocks - road_white = new BlockRoadRotatable("road_white"); - road_white_half = new BlockRoadRotatable("road_white_half"); - road_white_quarter = new BlockRoadRotatable("road_white_quarter"); - road_line = new BlockRoadLine("road_line"); - road_line_simple = new BlockRoadRotatable("road_line_simple"); - road_line_merge = new BlockRoadRotatable("road_line_merge"); - road_line_double = new BlockRoadLines("road_line_double"); - road_line_double_simple = new BlockRoadRotatable("road_line_double_simple"); - road_line_half_double = new BlockRoadLines("road_line_half_double"); - road_line_half_double_simple = new BlockRoadRotatable("road_line_half_double_simple"); - road_line_diagonal = new BlockRoadRotatable("road_line_diagonal"); - road_arrow_s = new BlockRoadRotatable("road_arrow_s"); - road_arrow_r = new BlockRoadRotatable("road_arrow_r"); - road_arrow_l = new BlockRoadRotatable("road_arrow_l"); - road_arrow_rl = new BlockRoadRotatable("road_arrow_rl"); - road_arrow_sr = new BlockRoadRotatable("road_arrow_sr"); - road_arrow_sl = new BlockRoadRotatable("road_arrow_sl"); - road_arrow_srl = new BlockRoadRotatable("road_arrow_srl"); - road_crosswalk = new BlockRoadRotatable("road_crosswalk"); - road_excl_zone = new BlockRoadRotatable("road_excl_zone"); - road_excl_zone_line = new BlockRoadRotatable("road_excl_zone_line"); - road_excl_zone_corner_in = new BlockRoadRotatable("road_excl_zone_corner_in"); - road_excl_zone_corner_out = new BlockRoadRotatable("road_excl_zone_corner_out"); - road_excl_zone_diagonal_in = new BlockRoadRotatable("road_excl_zone_diagonal_in"); - road_excl_zone_diagonal_out = new BlockRoadRotatable("road_excl_zone_diagonal_out"); - road_excl_zone_split_in_r = new BlockRoadRotatable("road_excl_zone_split_in_r"); - road_excl_zone_split_in_l = new BlockRoadRotatable("road_excl_zone_split_in_l"); - road_excl_zone_split_out_r = new BlockRoadRotatable("road_excl_zone_split_out_r"); - road_excl_zone_split_out_l = new BlockRoadRotatable("road_excl_zone_split_out_l"); + road_white = BlockRoad.create("road_white"); + road_white_half = BlockRoad.create("road_white_half"); + road_white_quarter = BlockRoad.create("road_white_quarter"); + road_line = BlockRoadLine.create(); + road_line_simple = BlockRoad.create("road_line_simple", "road_line_single"); + road_line_merge = BlockRoad.create("road_line_merge"); + road_line_double = BlockRoadLines.create("road_line_double", "road_line_double"); + road_line_double_simple = BlockRoad.create("road_line_double_simple", "road_line_double"); + road_line_half_double = BlockRoadLines.create("road_line_half_double", "road_line_half_double"); + road_line_half_double_simple = BlockRoad.create("road_line_half_double_simple", "road_line_half_double"); + road_line_diagonal = BlockRoad.create("road_line_diagonal"); + road_arrow_s = BlockRoad.create("road_arrow_s"); + road_arrow_r = BlockRoad.create("road_arrow_r"); + road_arrow_l = BlockRoad.create("road_arrow_l"); + road_arrow_rl = BlockRoad.create("road_arrow_rl"); + road_arrow_sr = BlockRoad.create("road_arrow_sr"); + road_arrow_sl = BlockRoad.create("road_arrow_sl"); + road_arrow_srl = BlockRoad.create("road_arrow_srl"); + road_crosswalk = BlockRoad.create("road_crosswalk"); + road_excl_zone = BlockRoad.create("road_excl_zone"); + road_excl_zone_line = BlockRoad.create("road_excl_zone_line"); + road_excl_zone_corner_in = BlockRoad.create("road_excl_zone_corner_in"); + road_excl_zone_corner_out = BlockRoad.create("road_excl_zone_corner_out"); + road_excl_zone_diagonal_in = BlockRoad.create("road_excl_zone_diagonal_in"); + road_excl_zone_diagonal_out = BlockRoad.create("road_excl_zone_diagonal_out"); + road_excl_zone_split_in_r = BlockRoad.create("road_excl_zone_split_in_r"); + road_excl_zone_split_in_l = BlockRoad.create("road_excl_zone_split_in_l"); + road_excl_zone_split_out_r = BlockRoad.create("road_excl_zone_split_out_r"); + road_excl_zone_split_out_l = BlockRoad.create("road_excl_zone_split_out_l"); // yellow road blocks - road_yellow = new BlockRoadRotatable("road_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_white_half_yellow = new BlockRoadRotatable("road_white_half_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_white_quarter_yellow = new BlockRoadRotatable("road_white_quarter_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_line_yellow = new BlockRoadLine("road_line_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_line_simple_yellow = new BlockRoadRotatable("road_line_simple_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_line_merge_yellow = new BlockRoadRotatable("road_line_merge_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_line_double_yellow = new BlockRoadLines("road_line_double_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_line_double_simple_yellow = new BlockRoadRotatable("road_line_double_simple_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_line_half_double_yellow = new BlockRoadLines("road_line_half_double_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_line_half_double_simple_yellow = new BlockRoadRotatable("road_line_half_double_simple_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_line_diagonal_yellow = new BlockRoadRotatable("road_line_diagonal_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_arrow_s_yellow = new BlockRoadRotatable("road_arrow_s_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_arrow_r_yellow = new BlockRoadRotatable("road_arrow_r_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_arrow_l_yellow = new BlockRoadRotatable("road_arrow_l_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_arrow_rl_yellow = new BlockRoadRotatable("road_arrow_rl_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_arrow_sr_yellow = new BlockRoadRotatable("road_arrow_sr_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_arrow_sl_yellow = new BlockRoadRotatable("road_arrow_sl_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_arrow_srl_yellow = new BlockRoadRotatable("road_arrow_srl_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_crosswalk_yellow = new BlockRoadRotatable("road_crosswalk_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_yellow = new BlockRoadRotatable("road_excl_zone_yellow").setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_line_yellow = new BlockRoadRotatable("road_excl_zone_line_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_corner_in_yellow = new BlockRoadRotatable("road_excl_zone_corner_in_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_corner_out_yellow = new BlockRoadRotatable("road_excl_zone_corner_out_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_diagonal_in_yellow = new BlockRoadRotatable("road_excl_zone_diagonal_in_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_diagonal_out_yellow = new BlockRoadRotatable("road_excl_zone_diagonal_out_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_split_in_r_yellow = new BlockRoadRotatable("road_excl_zone_split_in_r_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_split_in_l_yellow = new BlockRoadRotatable("road_excl_zone_split_in_l_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_split_out_r_yellow = new BlockRoadRotatable("road_excl_zone_split_out_r_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); - road_excl_zone_split_out_l_yellow = new BlockRoadRotatable("road_excl_zone_split_out_l_yellow") - .setCreativeTab(Roads.YELLOW_ROADS_TAB); + road_yellow = BlockRoad.createYellow("road_yellow"); + road_white_half_yellow = BlockRoad.createYellow("road_white_half_yellow"); + road_white_quarter_yellow = BlockRoad.createYellow("road_white_quarter_yellow"); + road_line_yellow = BlockRoadLine.createYellow(); + road_line_simple_yellow = BlockRoad.createYellow("road_line_simple_yellow", "road_line_single_yellow"); + road_line_merge_yellow = BlockRoad.createYellow("road_line_merge_yellow"); + road_line_double_yellow = BlockRoadLines.createYellow("road_line_double_yellow", "road_line_double"); + road_line_double_simple_yellow = BlockRoad.createYellow("road_line_double_simple_yellow", "road_line_double_yellow"); + road_line_half_double_yellow = BlockRoadLines.createYellow("road_line_half_double_yellow", "road_line_half_double"); + + road_line_half_double_simple_yellow = BlockRoad.createYellow("road_line_half_double_simple_yellow", + "road_line_half_double_yellow"); + road_line_diagonal_yellow = BlockRoad.createYellow("road_line_diagonal_yellow"); + road_arrow_s_yellow = BlockRoad.createYellow("road_arrow_s_yellow"); + road_arrow_r_yellow = BlockRoad.createYellow("road_arrow_r_yellow"); + road_arrow_l_yellow = BlockRoad.createYellow("road_arrow_l_yellow"); + road_arrow_rl_yellow = BlockRoad.createYellow("road_arrow_rl_yellow"); + road_arrow_sr_yellow = BlockRoad.createYellow("road_arrow_sr_yellow"); + road_arrow_sl_yellow = BlockRoad.createYellow("road_arrow_sl_yellow"); + road_arrow_srl_yellow = BlockRoad.createYellow("road_arrow_srl_yellow"); + road_crosswalk_yellow = BlockRoad.createYellow("road_crosswalk_yellow"); + road_excl_zone_yellow = BlockRoad.createYellow("road_excl_zone_yellow"); + road_excl_zone_line_yellow = BlockRoad.createYellow("road_excl_zone_line_yellow"); + road_excl_zone_corner_in_yellow = BlockRoad.createYellow("road_excl_zone_corner_in_yellow"); + road_excl_zone_corner_out_yellow = BlockRoad.createYellow("road_excl_zone_corner_out_yellow"); + road_excl_zone_diagonal_in_yellow = BlockRoad.createYellow("road_excl_zone_diagonal_in_yellow"); + road_excl_zone_diagonal_out_yellow = BlockRoad.createYellow("road_excl_zone_diagonal_out_yellow"); + road_excl_zone_split_in_r_yellow = BlockRoad.createYellow("road_excl_zone_split_in_r_yellow"); + road_excl_zone_split_in_l_yellow = BlockRoad.createYellow("road_excl_zone_split_in_l_yellow"); + road_excl_zone_split_out_r_yellow = BlockRoad.createYellow("road_excl_zone_split_out_r_yellow"); + road_excl_zone_split_out_l_yellow = BlockRoad.createYellow("road_excl_zone_split_out_l_yellow"); // road signs - road_sign_prohib_1 = new BlockRoadSign("road_sign_prohib_1"); - road_sign_prohib_2 = new BlockRoadSign("road_sign_prohib_2"); - road_sign_prohib_3a = new BlockRoadSign("road_sign_prohib_3a"); - road_sign_prohib_3b = new BlockRoadSign("road_sign_prohib_3b"); - road_sign_prohib_3c = new BlockRoadSign("road_sign_prohib_3c"); - road_sign_prohib_4a = new BlockRoadSign("road_sign_prohib_4a"); - road_sign_prohib_4b = new BlockRoadSign("road_sign_prohib_4b"); - road_sign_prohib_4c = new BlockRoadSign("road_sign_prohib_4c"); - road_sign_prohib_4d = new BlockRoadSign("road_sign_prohib_4d"); - road_sign_prohib_5 = new BlockRoadSign("road_sign_prohib_5"); - road_sign_prohib_6a = new BlockRoadSign("road_sign_prohib_6a"); - road_sign_prohib_6b = new BlockRoadSign("road_sign_prohib_6b"); - road_sign_prohib_6c = new BlockRoadSign("road_sign_prohib_6c"); - road_sign_prohib_6d = new BlockRoadSign("road_sign_prohib_6d"); - road_sign_prohib_7a = new BlockRoadSign("road_sign_prohib_7a"); - road_sign_prohib_7al = new BlockRoadSign("road_sign_prohib_7al"); - road_sign_prohib_7aw = new BlockRoadSign("road_sign_prohib_7aw"); - road_sign_prohib_7b = new BlockRoadSign("road_sign_prohib_7b"); - road_sign_prohib_7c = new BlockRoadSign("road_sign_prohib_7c"); - road_sign_prohib_7e = new BlockRoadSign("road_sign_prohib_7e"); - road_sign_prohib_7f = new BlockRoadSign("road_sign_prohib_7f"); - road_sign_prohib_8a = new BlockRoadSign("road_sign_prohib_8a"); - road_sign_prohib_8b = new BlockRoadSign("road_sign_prohib_8b"); - road_sign_prohib_8c = new BlockRoadSign("road_sign_prohib_8c"); - road_sign_prohib_9a = new BlockRoadSign("road_sign_prohib_9a"); - road_sign_prohib_9b = new BlockRoadSign("road_sign_prohib_9b"); - road_sign_prohib_9c = new BlockRoadSign("road_sign_prohib_9c"); - road_sign_prohib_9d = new BlockRoadSign("road_sign_prohib_9d"); - road_sign_prohib_10a20 = new BlockRoadSign("road_sign_prohib_10a20"); - road_sign_prohib_10a30 = new BlockRoadSign("road_sign_prohib_10a30"); - road_sign_prohib_10a40 = new BlockRoadSign("road_sign_prohib_10a40"); - road_sign_prohib_10a50 = new BlockRoadSign("road_sign_prohib_10a50"); - road_sign_prohib_10a60 = new BlockRoadSign("road_sign_prohib_10a60"); - road_sign_prohib_10a70 = new BlockRoadSign("road_sign_prohib_10a70"); - road_sign_prohib_10a80 = new BlockRoadSign("road_sign_prohib_10a80"); - road_sign_prohib_10a100 = new BlockRoadSign("road_sign_prohib_10a100"); - road_sign_prohib_10b20 = new BlockRoadSign("road_sign_prohib_10b20"); - road_sign_prohib_10b30 = new BlockRoadSign("road_sign_prohib_10b30"); - road_sign_prohib_10b40 = new BlockRoadSign("road_sign_prohib_10b40"); - road_sign_prohib_10b50 = new BlockRoadSign("road_sign_prohib_10b50"); - road_sign_prohib_10b60 = new BlockRoadSign("road_sign_prohib_10b60"); - road_sign_prohib_10b70 = new BlockRoadSign("road_sign_prohib_10b70"); - road_sign_prohib_10b80 = new BlockRoadSign("road_sign_prohib_10b80"); - road_sign_prohib_10b100 = new BlockRoadSign("road_sign_prohib_10b100"); - road_sign_prohib_11 = new BlockRoadSign("road_sign_prohib_11"); - road_sign_prohib_11a = new BlockRoadSign("road_sign_prohib_11a"); - road_sign_prohib_11b = new BlockRoadSign("road_sign_prohib_11b"); - road_sign_prohib_12 = new BlockRoadSign("road_sign_prohib_12"); - road_sign_prohib_13a = new BlockRoadSign("road_sign_prohib_13a"); - road_sign_prohib_13b = new BlockRoadSign("road_sign_prohib_13b"); - road_sign_prohib_13d = new BlockRoadSign("road_sign_prohib_13d"); - road_sign_prohib_13e = new BlockRoadSign("road_sign_prohib_13e"); - road_sign_prohib_14 = new BlockRoadSign("road_sign_prohib_14"); - - road_sign_warn_1 = new BlockRoadSign("road_sign_warn_1"); - road_sign_warn_2a = new BlockRoadSign("road_sign_warn_2a"); - road_sign_warn_2b = new BlockRoadSign("road_sign_warn_2b"); - road_sign_warn_2c = new BlockRoadSign("road_sign_warn_2c"); - road_sign_warn_2d = new BlockRoadSign("road_sign_warn_2d"); - road_sign_warn_3a = new BlockRoadSign("road_sign_warn_3a"); - road_sign_warn_3b = new BlockRoadSign("road_sign_warn_3b"); - road_sign_warn_4 = new BlockRoadSign("road_sign_warn_4"); - road_sign_warn_6a = new BlockRoadSign("road_sign_warn_6a"); - road_sign_warn_6b = new BlockRoadSign("road_sign_warn_6b"); - road_sign_warn_6c_i_r = new BlockRoadSign("road_sign_warn_6c_i_r"); - road_sign_warn_6c_i_l = new BlockRoadSign("road_sign_warn_6c_i_l"); - road_sign_warn_6c_ii_r = new BlockRoadSign("road_sign_warn_6c_ii_r"); - road_sign_warn_6c_ii_l = new BlockRoadSign("road_sign_warn_6c_ii_l"); - road_sign_warn_6c_iii_r = new BlockRoadSign("road_sign_warn_6c_iii_r"); - road_sign_warn_6c_iii_l = new BlockRoadSign("road_sign_warn_6c_iii_l"); - road_sign_warn_6d_a = new BlockRoadSign("road_sign_warn_6d_a"); - road_sign_warn_6d_b = new BlockRoadSign("road_sign_warn_6d_b"); - road_sign_warn_6d_c = new BlockRoadSign("road_sign_warn_6d_c"); - road_sign_warn_6d_d = new BlockRoadSign("road_sign_warn_6d_d"); - road_sign_warn_7 = new BlockRoadSign("road_sign_warn_7"); - road_sign_warn_7a = new BlockRoadSign("road_sign_warn_7a"); - road_sign_warn_8a = new BlockRoadSign("road_sign_warn_8a"); - road_sign_warn_8b = new BlockRoadSign("road_sign_warn_8b"); - road_sign_warn_8c = new BlockRoadSign("road_sign_warn_8c"); - road_sign_warn_9 = new BlockRoadSign("road_sign_warn_9"); - road_sign_warn_10 = new BlockRoadSign("road_sign_warn_10"); - road_sign_warn_10a = new BlockRoadSign("road_sign_warn_10a"); - road_sign_warn_10b = new BlockRoadSign("road_sign_warn_10b"); - road_sign_warn_10c = new BlockRoadSign("road_sign_warn_10c"); - road_sign_warn_11a = new BlockRoadSign("road_sign_warn_11a"); - road_sign_warn_11b = new BlockRoadSign("road_sign_warn_11b"); - road_sign_warn_12 = new BlockRoadSign("road_sign_warn_12"); - road_sign_warn_13 = new BlockRoadSign("road_sign_warn_13"); - road_sign_warn_14 = new BlockRoadSign("road_sign_warn_14"); - road_sign_warn_15 = new BlockRoadSign("road_sign_warn_15"); - road_sign_warn_16 = new BlockRoadSign("road_sign_warn_16"); - - road_sign_mandat_1 = new BlockRoadSign("road_sign_mandat_1"); - road_sign_mandat_2 = new BlockRoadSign("road_sign_mandat_2"); - road_sign_mandat_3 = new BlockRoadSign("road_sign_mandat_3"); - road_sign_mandat_4 = new BlockRoadSign("road_sign_mandat_4"); - road_sign_mandat_5 = new BlockRoadSign("road_sign_mandat_5"); - road_sign_mandat_6 = new BlockRoadSign("road_sign_mandat_6"); - road_sign_mandat_7 = new BlockRoadSign("road_sign_mandat_7"); - road_sign_mandat_8 = new BlockRoadSign("road_sign_mandat_8"); - road_sign_mandat_9 = new BlockRoadSign("road_sign_mandat_9"); - road_sign_mandat_10 = new BlockRoadSign("road_sign_mandat_10"); - road_sign_mandat_16 = new BlockRoadSign("road_sign_mandat_16"); - road_sign_mandat_16a = new BlockRoadSign("road_sign_mandat_16a"); - road_sign_mandat_17 = new BlockRoadSign("road_sign_mandat_17"); - road_sign_mandat_17a_a = new BlockRoadSign("road_sign_mandat_17a_a"); - road_sign_mandat_17a_b = new BlockRoadSign("road_sign_mandat_17a_b"); - road_sign_mandat_17a_c = new BlockRoadSign("road_sign_mandat_17a_c"); - road_sign_mandat_17a_d = new BlockRoadSign("road_sign_mandat_17a_d"); - road_sign_mandat_17b = new BlockRoadSign("road_sign_mandat_17b"); - road_sign_mandat_17c = new BlockRoadSign("road_sign_mandat_17c"); - road_sign_mandat_18 = new BlockRoadSign("road_sign_mandat_18"); - road_sign_mandat_22 = new BlockRoadSign("road_sign_mandat_22"); - road_sign_mandat_22a = new BlockRoadSign("road_sign_mandat_22a"); - - road_sign_priority_1 = new BlockRoadSign("road_sign_priority_1"); - road_sign_priority_2 = new BlockRoadSign("road_sign_priority_2"); - road_sign_priority_3a = new BlockRoadSign("road_sign_priority_3a"); - road_sign_priority_3b = new BlockRoadSign("road_sign_priority_3b"); - - road_sign_info_1a = new BlockRoadSign("road_sign_info_1a"); - road_sign_info_1b = new BlockRoadSign("road_sign_info_1b"); - road_sign_info_2 = new BlockRoadSign("road_sign_info_2"); - road_sign_info_2a = new BlockRoadSign("road_sign_info_2a"); - road_sign_info_2b = new BlockRoadSign("road_sign_info_2b"); - road_sign_info_2c_a = new BlockRoadSign("road_sign_info_2c_a"); - road_sign_info_2c_b = new BlockRoadSign("road_sign_info_2c_b"); - road_sign_info_3 = new BlockRoadSign("road_sign_info_3"); - road_sign_info_3a = new BlockRoadSign("road_sign_info_3a"); - road_sign_info_4 = new BlockRoadSign("road_sign_info_4"); - road_sign_info_5 = new BlockRoadSign("road_sign_info_5"); - road_sign_info_6a = new BlockRoadSign("road_sign_info_6a"); - road_sign_info_7a = new BlockRoadSign("road_sign_info_7a"); - road_sign_info_8a = new BlockRoadSign("road_sign_info_8a"); - road_sign_info_8b = new BlockRoadSign("road_sign_info_8b"); - road_sign_info_8c = new BlockRoadSign("road_sign_info_8c"); - road_sign_info_8d = new BlockRoadSign("road_sign_info_8d"); - road_sign_info_9a = new BlockRoadSign("road_sign_info_9a"); - road_sign_info_9b = new BlockRoadSign("road_sign_info_9b"); - road_sign_info_9c = new BlockRoadSign("road_sign_info_9c"); - road_sign_info_9d = new BlockRoadSign("road_sign_info_9d"); - road_sign_info_9e = new BlockRoadSign("road_sign_info_9e"); - road_sign_info_9f = new BlockRoadSign("road_sign_info_9f"); - road_sign_info_9g = new BlockRoadSign("road_sign_info_9g"); - road_sign_info_10a = new BlockRoadSign("road_sign_info_10a"); - road_sign_info_10b = new BlockRoadSign("road_sign_info_10b"); - road_sign_info_10c = new BlockRoadSign("road_sign_info_10c"); - road_sign_info_10d = new BlockRoadSign("road_sign_info_10d"); - road_sign_info_11 = new BlockRoadSign("road_sign_info_11"); - road_sign_info_16a = new BlockRoadSign("road_sign_info_16a"); - road_sign_info_16b = new BlockRoadSign("road_sign_info_16b"); - road_sign_info_16c = new BlockRoadSign("road_sign_info_16c"); - road_sign_info_16d = new BlockRoadSign("road_sign_info_16d"); + road_sign_prohib_1 = new BlockRoadSignRotatable("road_sign_prohib_1", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_2 = new BlockRoadSignRotatable("road_sign_prohib_2", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_3a = new BlockRoadSignRotatable("road_sign_prohib_3a", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_3b = new BlockRoadSignRotatable("road_sign_prohib_3b", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_3c = new BlockRoadSignRotatable("road_sign_prohib_3c", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_4a = new BlockRoadSignRotatable("road_sign_prohib_4a", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_4b = new BlockRoadSignRotatable("road_sign_prohib_4b", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_4c = new BlockRoadSignRotatable("road_sign_prohib_4c", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_4d = new BlockRoadSignRotatable("road_sign_prohib_4d", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_5 = new BlockRoadSignRotatable("road_sign_prohib_5", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_6a = new BlockRoadSignRotatable("road_sign_prohib_6a", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_6b = new BlockRoadSignRotatable("road_sign_prohib_6b", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_6c = new BlockRoadSignRotatable("road_sign_prohib_6c", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_6d = new BlockRoadSignRotatable("road_sign_prohib_6d", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_7a = new BlockRoadSignRotatable("road_sign_prohib_7a", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_7al = new BlockRoadSignRotatable("road_sign_prohib_7al", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_7aw = new BlockRoadSignRotatable("road_sign_prohib_7aw", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_7b = new BlockRoadSignRotatable("road_sign_prohib_7b", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_7c = new BlockRoadSignRotatable("road_sign_prohib_7c", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_7e = new BlockRoadSignRotatable("road_sign_prohib_7e", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_prohib_7f = new BlockRoadSignRotatable("road_sign_prohib_7f", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_8a = new BlockRoadSignRotatable("road_sign_prohib_8a", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_8b = new BlockRoadSignRotatable("road_sign_prohib_8b", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_8c = new BlockRoadSignRotatable("road_sign_prohib_8c", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_9a = new BlockRoadSignRotatable("road_sign_prohib_9a", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_9b = new BlockRoadSignRotatable("road_sign_prohib_9b", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_9c = new BlockRoadSignRotatable("road_sign_prohib_9c", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_9d = new BlockRoadSignRotatable("road_sign_prohib_9d", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10a20 = new BlockRoadSignRotatable("road_sign_prohib_10a20", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10a30 = new BlockRoadSignRotatable("road_sign_prohib_10a30", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10a40 = new BlockRoadSignRotatable("road_sign_prohib_10a40", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10a50 = new BlockRoadSignRotatable("road_sign_prohib_10a50", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10a60 = new BlockRoadSignRotatable("road_sign_prohib_10a60", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10a70 = new BlockRoadSignRotatable("road_sign_prohib_10a70", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10a80 = new BlockRoadSignRotatable("road_sign_prohib_10a80", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10a100 = new BlockRoadSignRotatable("road_sign_prohib_10a100", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10b20 = new BlockRoadSignRotatable("road_sign_prohib_10b20", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10b30 = new BlockRoadSignRotatable("road_sign_prohib_10b30", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10b40 = new BlockRoadSignRotatable("road_sign_prohib_10b40", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10b50 = new BlockRoadSignRotatable("road_sign_prohib_10b50", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10b60 = new BlockRoadSignRotatable("road_sign_prohib_10b60", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10b70 = new BlockRoadSignRotatable("road_sign_prohib_10b70", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10b80 = new BlockRoadSignRotatable("road_sign_prohib_10b80", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_10b100 = new BlockRoadSignRotatable("road_sign_prohib_10b100", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_11 = new BlockRoadSignRotatable("road_sign_prohib_11", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_11a = new BlockRoadSignRotatable("road_sign_prohib_11a", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_prohib_11b = new BlockRoadSignRotatable("road_sign_prohib_11b", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_prohib_12 = new BlockRoadSignRotatable("road_sign_prohib_12", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_13a = new BlockRoadSignRotatable("road_sign_prohib_13a", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_13b = new BlockRoadSignRotatable("road_sign_prohib_13b", BlockRoadSignRotatable.BACK_ROUND); + road_sign_prohib_13d = new BlockRoadSignRotatable("road_sign_prohib_13d", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_prohib_13e = new BlockRoadSignRotatable("road_sign_prohib_13e", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_prohib_14 = new BlockRoadSignRotatable("road_sign_prohib_14", BlockRoadSignRotatable.BACK_ROUND); + + road_sign_warn_1 = new BlockRoadSignRotatable("road_sign_warn_1", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_2a = new BlockRoadSignRotatable("road_sign_warn_2a", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_2b = new BlockRoadSignRotatable("road_sign_warn_2b", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_2c = new BlockRoadSignRotatable("road_sign_warn_2c", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_2d = new BlockRoadSignRotatable("road_sign_warn_2d", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_3a = new BlockRoadSignRotatable("road_sign_warn_3a", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_3b = new BlockRoadSignRotatable("road_sign_warn_3b", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_4 = new BlockRoadSignRotatable("road_sign_warn_4", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_6a = new BlockRoadSignRotatable("road_sign_warn_6a", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_6b = new BlockRoadSignRotatable("road_sign_warn_6b", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_6c_i_r = new BlockRoadSignRotatable("road_sign_warn_6c_i_r", + BlockRoadSignRotatable.BACK_SMALL_VERTICAL_RECTANGLE); + road_sign_warn_6c_i_l = new BlockRoadSignRotatable("road_sign_warn_6c_i_l", + BlockRoadSignRotatable.BACK_SMALL_VERTICAL_RECTANGLE); + road_sign_warn_6c_ii_r = new BlockRoadSignRotatable("road_sign_warn_6c_ii_r", + BlockRoadSignRotatable.BACK_SMALL_VERTICAL_RECTANGLE); + road_sign_warn_6c_ii_l = new BlockRoadSignRotatable("road_sign_warn_6c_ii_l", + BlockRoadSignRotatable.BACK_SMALL_VERTICAL_RECTANGLE); + road_sign_warn_6c_iii_r = new BlockRoadSignRotatable("road_sign_warn_6c_iii_r", + BlockRoadSignRotatable.BACK_SMALL_VERTICAL_RECTANGLE); + road_sign_warn_6c_iii_l = new BlockRoadSignRotatable("road_sign_warn_6c_iii_l", + BlockRoadSignRotatable.BACK_SMALL_VERTICAL_RECTANGLE); + road_sign_warn_6d_a = new BlockRoadSignRotatable("road_sign_warn_6d_a", "road_sign_warn_6d_a_back"); + road_sign_warn_6d_b = new BlockRoadSignRotatable("road_sign_warn_6d_b", "road_sign_warn_6d_b_back"); + road_sign_warn_6d_c = new BlockRoadSignRotatable("road_sign_warn_6d_c", "road_sign_warn_6d_c_back"); + road_sign_warn_6d_d = new BlockRoadSignRotatable("road_sign_warn_6d_d", "road_sign_warn_6d_d_back"); + road_sign_warn_7 = new BlockRoadSignRotatable("road_sign_warn_7", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_7a = new BlockRoadSignRotatable("road_sign_warn_7a", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_8a = new BlockRoadSignRotatable("road_sign_warn_8a", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_8b = new BlockRoadSignRotatable("road_sign_warn_8b", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_8c = new BlockRoadSignRotatable("road_sign_warn_8c", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_9 = new BlockRoadSignRotatable("road_sign_warn_9", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_10 = new BlockRoadSignRotatable("road_sign_warn_10", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_10a = new BlockRoadSignRotatable("road_sign_warn_10a", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_10b = new BlockRoadSignRotatable("road_sign_warn_10b", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_10c = new BlockRoadSignRotatable("road_sign_warn_10c", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_11a = new BlockRoadSignRotatable("road_sign_warn_11a", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_11b = new BlockRoadSignRotatable("road_sign_warn_11b", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_12 = new BlockRoadSignRotatable("road_sign_warn_12", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_13 = new BlockRoadSignRotatable("road_sign_warn_13", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_14 = new BlockRoadSignRotatable("road_sign_warn_14", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_15 = new BlockRoadSignRotatable("road_sign_warn_15", BlockRoadSignRotatable.BACK_TRIANGLE); + road_sign_warn_16 = new BlockRoadSignRotatable("road_sign_warn_16", BlockRoadSignRotatable.BACK_TRIANGLE); + + road_sign_mandat_1 = new BlockRoadSignRotatable("road_sign_mandat_1", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_2 = new BlockRoadSignRotatable("road_sign_mandat_2", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_3 = new BlockRoadSignRotatable("road_sign_mandat_3", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_4 = new BlockRoadSignRotatable("road_sign_mandat_4", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_5 = new BlockRoadSignRotatable("road_sign_mandat_5", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_6 = new BlockRoadSignRotatable("road_sign_mandat_6", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_7 = new BlockRoadSignRotatable("road_sign_mandat_7", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_8 = new BlockRoadSignRotatable("road_sign_mandat_8", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_9 = new BlockRoadSignRotatable("road_sign_mandat_9", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_10 = new BlockRoadSignRotatable("road_sign_mandat_10", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_16 = new BlockRoadSignRotatable("road_sign_mandat_16", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_16a = new BlockRoadSignRotatable("road_sign_mandat_16a", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_17 = new BlockRoadSignRotatable("road_sign_mandat_17", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_17a_a = new BlockRoadSignRotatable("road_sign_mandat_17a_a", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_17a_b = new BlockRoadSignRotatable("road_sign_mandat_17a_b", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_17a_c = new BlockRoadSignRotatable("road_sign_mandat_17a_c", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_17a_d = new BlockRoadSignRotatable("road_sign_mandat_17a_d", + BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_17b = new BlockRoadSignRotatable("road_sign_mandat_17b", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_17c = new BlockRoadSignRotatable("road_sign_mandat_17c", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_18 = new BlockRoadSignRotatable("road_sign_mandat_18", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_22 = new BlockRoadSignRotatable("road_sign_mandat_22", BlockRoadSignRotatable.BACK_ROUND); + road_sign_mandat_22a = new BlockRoadSignRotatable("road_sign_mandat_22a", BlockRoadSignRotatable.BACK_ROUND); + + road_sign_priority_1 = new BlockRoadSignRotatable("road_sign_priority_1", + BlockRoadSignRotatable.BACK_INVERTED_TRIANGLE); + road_sign_priority_2 = new BlockRoadSignRotatable("road_sign_priority_2", + BlockRoadSignRotatable.BACK_HEXAGONAL); + road_sign_priority_3a = new BlockRoadSignRotatable("road_sign_priority_3a", + BlockRoadSignRotatable.BACK_DIAMOND); + road_sign_priority_3b = new BlockRoadSignRotatable("road_sign_priority_3b", + BlockRoadSignRotatable.BACK_DIAMOND); + + road_sign_info_1a = new BlockRoadSignRotatable("road_sign_info_1a", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_1b = new BlockRoadSignRotatable("road_sign_info_1b", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_2 = new BlockRoadSignRotatable("road_sign_info_2", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_2a = new BlockRoadSignRotatable("road_sign_info_2a", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_2b = new BlockRoadSignRotatable("road_sign_info_2b", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_2c_a = new BlockRoadSignRotatable("road_sign_info_2c_a", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_2c_b = new BlockRoadSignRotatable("road_sign_info_2c_b", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_3 = new BlockRoadSignRotatable("road_sign_info_3", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_3a = new BlockRoadSignRotatable("road_sign_info_3a", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_4 = new BlockRoadSignRotatable("road_sign_info_4", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_5 = new BlockRoadSignRotatable("road_sign_info_5", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_6a = new BlockRoadSignRotatable("road_sign_info_6a", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_7a = new BlockRoadSignRotatable("road_sign_info_7a", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_8a = new BlockRoadSignRotatable("road_sign_info_8a", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_8b = new BlockRoadSignRotatable("road_sign_info_8b", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_8c = new BlockRoadSignRotatable("road_sign_info_8c", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_8d = new BlockRoadSignRotatable("road_sign_info_8d", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_9a = new BlockRoadSignRotatable("road_sign_info_9a", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_9b = new BlockRoadSignRotatable("road_sign_info_9b", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_9c = new BlockRoadSignRotatable("road_sign_info_9c", + BlockRoadSignRotatable.BACK_HORIZONTAL_RECTANGLE); + road_sign_info_9d = new BlockRoadSignRotatable("road_sign_info_9d", + BlockRoadSignRotatable.BACK_HORIZONTAL_RECTANGLE); + road_sign_info_9e = new BlockRoadSignRotatable("road_sign_info_9e", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_9f = new BlockRoadSignRotatable("road_sign_info_9f", + BlockRoadSignRotatable.BACK_VERTICAL_RECTANGLE); + road_sign_info_9g = new BlockRoadSignRotatable("road_sign_info_9g", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_10a = new BlockRoadSignRotatable("road_sign_info_10a", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_RECTANGLE); + road_sign_info_10b = new BlockRoadSignRotatable("road_sign_info_10b", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_RECTANGLE); + road_sign_info_10c = new BlockRoadSignRotatable("road_sign_info_10c", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_RECTANGLE); + road_sign_info_10d = new BlockRoadSignRotatable("road_sign_info_10d", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_RECTANGLE); + road_sign_info_11 = new BlockRoadSignRotatable("road_sign_info_11", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_16a = new BlockRoadSignRotatable("road_sign_info_16a", BlockRoadSignRotatable.BACK_ARROW_LEFT); + road_sign_info_16b = new BlockRoadSignRotatable("road_sign_info_16b", BlockRoadSignRotatable.BACK_ARROW_RIGHT); + road_sign_info_16c = new BlockRoadSignRotatable("road_sign_info_16c", BlockRoadSignRotatable.BACK_ARROW_LEFT); + road_sign_info_16d = new BlockRoadSignRotatable("road_sign_info_16d", BlockRoadSignRotatable.BACK_ARROW_RIGHT); road_sign_info_17a = new BlockRoadTownSign("road_sign_info_17a"); road_sign_info_17b = new BlockRoadTownSign("road_sign_info_17b"); - road_sign_info_23 = new BlockRoadSign("road_sign_info_23"); - road_sign_info_23b = new BlockRoadSign("road_sign_info_23b"); + road_sign_info_23 = new BlockRoadSignRotatable("road_sign_info_23", + BlockRoadSignRotatable.BACK_AVERAGE_VERTICAL_RECTANGLE); + road_sign_info_23b = new BlockRoadSignRotatable("road_sign_info_23b", + BlockRoadSignRotatable.BACK_AVERAGE_VERTICAL_RECTANGLE); + road_sign_info_24 = new BlockRoadSignRotatable("road_sign_info_24", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_25a = new BlockRoadSignRotatable("road_sign_info_25a", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_25b = new BlockRoadSignRotatable("road_sign_info_25b", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_26a = new BlockRoadSignRotatable("road_sign_info_26a", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_26b = new BlockRoadSignRotatable("road_sign_info_26b", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_26c = new BlockRoadSignRotatable("road_sign_info_26c", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_27a = new BlockRoadSignRotatable("road_sign_info_27a", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_27b = new BlockRoadSignRotatable("road_sign_info_27b", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_27c = new BlockRoadSignRotatable("road_sign_info_27c", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_28a = new BlockRoadSignRotatable("road_sign_info_28a", BlockRoadSignRotatable.BACK_SQUARE); + road_sign_info_28b = new BlockRoadSignRotatable("road_sign_info_28b", BlockRoadSignRotatable.BACK_SQUARE); + + road_sign_meta_1 = new BlockRoadSignRotatable("road_sign_meta_1", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_TOP_RECTANGLE); + road_sign_meta_2a = new BlockRoadSignRotatable("road_sign_meta_2a", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_TOP_RECTANGLE); + road_sign_meta_2b = new BlockRoadSignRotatable("road_sign_meta_2b", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_TOP_RECTANGLE); + road_sign_meta_2c = new BlockRoadSignRotatable("road_sign_meta_2c", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_TOP_RECTANGLE); + road_sign_meta_2d = new BlockRoadSignRotatable("road_sign_meta_2d", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_TOP_RECTANGLE); + road_sign_meta_2e = new BlockRoadSignRotatable("road_sign_meta_2e", + BlockRoadSignRotatable.BACK_SMALL_HORIZONTAL_TOP_RECTANGLE); road_sign_post = new BlockRoadSignPost(); + road_junction_marker = new BlockRoadMarker("road_junction_marker"); // other stuff road_sidewalk = new BlockRoadSidewalk(); @@ -488,98 +573,94 @@ public static void init() { road_lantern = new BlockRoadLantern("road_lantern", false); road_lantern_lit = new BlockRoadLantern("road_lantern_lit", true); - // road_traffic_light = new BlockRoadSign("road_traffic_light"); - road_traffic_light = new BlockRoadSign("road_traffic_light"); + road_traffic_light = new BlockRoadSignLegacy("road_traffic_light_auto"); road_traffic_light_manual = new BlockRoadTrafficLight(); - - road_traffic_light_red = new BlockRoadSign("road_traffic_light_red"); - road_traffic_light_red_dyn = new BlockRoadTrafficLightRed(); - - road_traffic_light_yellow_fixed = new BlockRoadSign("road_traffic_light_yellow"); - road_traffic_light_yellow_dyn = new BlockRoadTrafficLightYellow(); + road_traffic_light_green = new BlockRoadTrafficLightGreen(); + road_traffic_light_yellow = new BlockRoadTrafficLightYellow(); road_traffic_light_yellow_blinking = new BlockRoadTrafficLightBlinkingYellow(); - - road_traffic_light_green = new BlockRoadSign("road_traffic_light_green"); - road_traffic_light_green_dyn = new BlockRoadTrafficLightGreen(); - + road_traffic_light_red = new BlockRoadTrafficLightRed(); - // road_traffic_light_off = new BlockRoadSign("road_traffic_light_off"); - - road_pedestrian_traffic_light = new BlockRoadSign("road_pedestrian_traffic_light"); + road_pedestrian_traffic_light = new BlockRoadSignLegacy("road_pedestrian_traffic_light_auto"); road_pedestrian_traffic_light_manual = new BlockRoadPedestrianTrafficLight(); road_pedestrian_traffic_light_green = new BlockRoadPedestrianTrafficLightGreen(); road_pedestrian_traffic_light_red = new BlockRoadPedestrianTrafficLightRed(); road_pedestrian_traffic_light_off = new BlockRoadPedestrianTrafficLightOff(); sign_printer = new BlockSignPrinter(); + + ModelLoaderRegistry.registerLoader(new RoadSignModelLoader()); } public static void register() { registerBlock(asphalt); - registerBlock(road); - registerBlock(road_white); - registerBlock(road_white_half); - registerBlock(road_white_quarter); - registerBlock(road_line); - registerBlock(road_line_simple); - registerBlock(road_line_merge); - registerBlock(road_line_double); - registerBlock(road_line_double_simple); - registerBlock(road_line_half_double); - registerBlock(road_line_half_double_simple); - registerBlock(road_line_diagonal); - registerBlock(road_arrow_s); - registerBlock(road_arrow_r); - registerBlock(road_arrow_l); - registerBlock(road_arrow_rl); - registerBlock(road_arrow_sr); - registerBlock(road_arrow_sl); - registerBlock(road_arrow_srl); - registerBlock(road_crosswalk); - registerBlock(road_excl_zone); - registerBlock(road_excl_zone_line); - registerBlock(road_excl_zone_corner_in); - registerBlock(road_excl_zone_corner_out); - registerBlock(road_excl_zone_diagonal_in); - registerBlock(road_excl_zone_diagonal_out); - registerBlock(road_excl_zone_split_in_l); - registerBlock(road_excl_zone_split_in_r); - registerBlock(road_excl_zone_split_out_l); - registerBlock(road_excl_zone_split_out_r); - - registerBlock(road_yellow); - registerBlock(road_white_half_yellow); - registerBlock(road_white_quarter_yellow); - registerBlock(road_line_yellow); - registerBlock(road_line_simple_yellow); - registerBlock(road_line_merge_yellow); - registerBlock(road_line_double_yellow); - registerBlock(road_line_double_simple_yellow); - registerBlock(road_line_half_double_yellow); - registerBlock(road_line_half_double_simple_yellow); - registerBlock(road_line_diagonal_yellow); - registerBlock(road_arrow_s_yellow); - registerBlock(road_arrow_r_yellow); - registerBlock(road_arrow_l_yellow); - registerBlock(road_arrow_rl_yellow); - registerBlock(road_arrow_sr_yellow); - registerBlock(road_arrow_sl_yellow); - registerBlock(road_arrow_srl_yellow); - registerBlock(road_crosswalk_yellow); - registerBlock(road_excl_zone_yellow); - registerBlock(road_excl_zone_line_yellow); - registerBlock(road_excl_zone_corner_in_yellow); - registerBlock(road_excl_zone_corner_out_yellow); - registerBlock(road_excl_zone_diagonal_in_yellow); - registerBlock(road_excl_zone_diagonal_out_yellow); - registerBlock(road_excl_zone_split_in_l_yellow); - registerBlock(road_excl_zone_split_in_r_yellow); - registerBlock(road_excl_zone_split_out_l_yellow); - registerBlock(road_excl_zone_split_out_r_yellow); + registerBlocks(road); + registerBlocks(road_white); + + registerBlocks(road_white_half); + registerBlocks(road_white_quarter); + + registerBlocks(road_line); + registerBlocks(road_line_simple); + + registerBlocks(road_line_merge); + registerBlocks(road_line_double); + registerBlocks(road_line_double_simple); + registerBlocks(road_line_half_double); + registerBlocks(road_line_half_double_simple); + registerBlocks(road_line_diagonal); + registerBlocks(road_arrow_s); + registerBlocks(road_arrow_r); + registerBlocks(road_arrow_l); + registerBlocks(road_arrow_rl); + registerBlocks(road_arrow_sr); + registerBlocks(road_arrow_sl); + registerBlocks(road_arrow_srl); + registerBlocks(road_crosswalk); + registerBlocks(road_excl_zone); + registerBlocks(road_excl_zone_line); + registerBlocks(road_excl_zone_corner_in); + registerBlocks(road_excl_zone_corner_out); + registerBlocks(road_excl_zone_diagonal_in); + registerBlocks(road_excl_zone_diagonal_out); + registerBlocks(road_excl_zone_split_in_l); + registerBlocks(road_excl_zone_split_in_r); + registerBlocks(road_excl_zone_split_out_l); + registerBlocks(road_excl_zone_split_out_r); + + registerBlocks(road_yellow); + registerBlocks(road_white_half_yellow); + registerBlocks(road_white_quarter_yellow); + registerBlocks(road_line_yellow); + registerBlocks(road_line_simple_yellow); + registerBlocks(road_line_merge_yellow); + registerBlocks(road_line_double_yellow); + registerBlocks(road_line_double_simple_yellow); + registerBlocks(road_line_half_double_yellow); + registerBlocks(road_line_half_double_simple_yellow); + registerBlocks(road_line_diagonal_yellow); + registerBlocks(road_arrow_s_yellow); + registerBlocks(road_arrow_r_yellow); + registerBlocks(road_arrow_l_yellow); + registerBlocks(road_arrow_rl_yellow); + registerBlocks(road_arrow_sr_yellow); + registerBlocks(road_arrow_sl_yellow); + registerBlocks(road_arrow_srl_yellow); + registerBlocks(road_crosswalk_yellow); + registerBlocks(road_excl_zone_yellow); + registerBlocks(road_excl_zone_line_yellow); + registerBlocks(road_excl_zone_corner_in_yellow); + registerBlocks(road_excl_zone_corner_out_yellow); + registerBlocks(road_excl_zone_diagonal_in_yellow); + registerBlocks(road_excl_zone_diagonal_out_yellow); + registerBlocks(road_excl_zone_split_in_l_yellow); + registerBlocks(road_excl_zone_split_in_r_yellow); + registerBlocks(road_excl_zone_split_out_l_yellow); + registerBlocks(road_excl_zone_split_out_r_yellow); registerBlock(road_sidewalk); registerBlock(road_guardrail); registerBlock(road_sign_post); + registerBlock(road_junction_marker); registerBlock(road_sign_prohib_1); registerBlock(road_sign_prohib_2); registerBlock(road_sign_prohib_3a); @@ -733,22 +814,37 @@ public static void register() { registerBlock(road_sign_info_17b); registerBlock(road_sign_info_23); registerBlock(road_sign_info_23b); + registerBlock(road_sign_info_24); + registerBlock(road_sign_info_25a); + registerBlock(road_sign_info_25b); + registerBlock(road_sign_info_26a); + registerBlock(road_sign_info_26b); + registerBlock(road_sign_info_26c); + registerBlock(road_sign_info_27a); + registerBlock(road_sign_info_27b); + registerBlock(road_sign_info_27c); + registerBlock(road_sign_info_28a); + registerBlock(road_sign_info_28b); + + registerBlock(road_sign_meta_1); + registerBlock(road_sign_meta_2a); + registerBlock(road_sign_meta_2b); + registerBlock(road_sign_meta_2c); + registerBlock(road_sign_meta_2d); + registerBlock(road_sign_meta_2e); registerBlock(road_lantern); registerBlock(road_lantern_lit); registerBlock(road_traffic_light); + registerBlock(road_traffic_light_manual); + registerBlock(road_traffic_light_green); - registerBlock(road_traffic_light_red); - registerBlock(road_traffic_light_red_dyn); - - registerBlock(road_traffic_light_yellow_dyn); + registerBlock(road_traffic_light_yellow); registerBlock(road_traffic_light_yellow_blinking); - registerBlock(road_traffic_light_yellow_fixed); - - registerBlock(road_traffic_light_green); - registerBlock(road_traffic_light_green_dyn); + + registerBlock(road_traffic_light_red); registerBlock(road_pedestrian_traffic_light); registerBlock(road_pedestrian_traffic_light_manual); @@ -757,6 +853,15 @@ public static void register() { registerBlock(road_pedestrian_traffic_light_off); registerBlock(sign_printer); + + } + + private static void registerBlocks(Block[] blocks) { + for (Block block : blocks) { + registerBlock(block, ((BlockRoad) block).createItemBlock()); + } + + RoadCrafting.RegistrationHandler.BLOCKS_ROAD.add(blocks); } private static void registerBlock(Block block) { @@ -771,70 +876,74 @@ private static void registerBlock(Block block, ItemBlock item) { public static void registerModels() { registerModel(asphalt); - registerModel(road); - registerModel(road_white); - registerModel(road_white_half); - registerModel(road_white_quarter); - registerModel(road_line); - registerModel(road_line_simple); - registerModel(road_line_merge); - registerModel(road_line_double); - registerModel(road_line_double_simple); - registerModel(road_line_half_double); - registerModel(road_line_half_double_simple); - registerModel(road_line_diagonal); - registerModel(road_arrow_s); - registerModel(road_arrow_r); - registerModel(road_arrow_l); - registerModel(road_arrow_rl); - registerModel(road_arrow_sr); - registerModel(road_arrow_sl); - registerModel(road_arrow_srl); - registerModel(road_crosswalk); - registerModel(road_excl_zone); - registerModel(road_excl_zone_line); - registerModel(road_excl_zone_corner_in); - registerModel(road_excl_zone_corner_out); - registerModel(road_excl_zone_diagonal_in); - registerModel(road_excl_zone_diagonal_out); - registerModel(road_excl_zone_split_in_l); - registerModel(road_excl_zone_split_in_r); - registerModel(road_excl_zone_split_out_l); - registerModel(road_excl_zone_split_out_r); - - registerModel(road_yellow); - registerModel(road_white_half_yellow); - registerModel(road_white_quarter_yellow); - registerModel(road_line_yellow); - registerModel(road_line_simple_yellow); - registerModel(road_line_merge_yellow); - registerModel(road_line_double_yellow); - registerModel(road_line_double_simple_yellow); - registerModel(road_line_half_double_yellow); - registerModel(road_line_half_double_simple_yellow); - registerModel(road_line_diagonal_yellow); - registerModel(road_arrow_s_yellow); - registerModel(road_arrow_r_yellow); - registerModel(road_arrow_l_yellow); - registerModel(road_arrow_rl_yellow); - registerModel(road_arrow_sr_yellow); - registerModel(road_arrow_sl_yellow); - registerModel(road_arrow_srl_yellow); - registerModel(road_crosswalk_yellow); - registerModel(road_excl_zone_yellow); - registerModel(road_excl_zone_line_yellow); - registerModel(road_excl_zone_corner_in_yellow); - registerModel(road_excl_zone_corner_out_yellow); - registerModel(road_excl_zone_diagonal_in_yellow); - registerModel(road_excl_zone_diagonal_out_yellow); - registerModel(road_excl_zone_split_in_l_yellow); - registerModel(road_excl_zone_split_in_r_yellow); - registerModel(road_excl_zone_split_out_l_yellow); - registerModel(road_excl_zone_split_out_r_yellow); + registerModels(road); + registerModels(road_white); + + registerModels(road_white_half); + registerModels(road_white_quarter); + + registerModels(road_line); + registerModels(road_line_simple); + + registerModels(road_line_merge); + registerModels(road_line_double); + registerModels(road_line_double_simple); + registerModels(road_line_half_double); + registerModels(road_line_half_double_simple); + registerModels(road_line_diagonal); + registerModels(road_arrow_s); + registerModels(road_arrow_r); + registerModels(road_arrow_l); + registerModels(road_arrow_rl); + registerModels(road_arrow_sr); + registerModels(road_arrow_sl); + registerModels(road_arrow_srl); + registerModels(road_crosswalk); + registerModels(road_excl_zone); + registerModels(road_excl_zone_line); + registerModels(road_excl_zone_corner_in); + registerModels(road_excl_zone_corner_out); + registerModels(road_excl_zone_diagonal_in); + registerModels(road_excl_zone_diagonal_out); + registerModels(road_excl_zone_split_in_l); + registerModels(road_excl_zone_split_in_r); + registerModels(road_excl_zone_split_out_l); + registerModels(road_excl_zone_split_out_r); + + registerModels(road_yellow); + registerModels(road_white_half_yellow); + registerModels(road_white_quarter_yellow); + registerModels(road_line_yellow); + registerModels(road_line_simple_yellow); + registerModels(road_line_merge_yellow); + registerModels(road_line_double_yellow); + registerModels(road_line_double_simple_yellow); + registerModels(road_line_half_double_yellow); + registerModels(road_line_half_double_simple_yellow); + registerModels(road_line_diagonal_yellow); + registerModels(road_arrow_s_yellow); + registerModels(road_arrow_r_yellow); + registerModels(road_arrow_l_yellow); + registerModels(road_arrow_rl_yellow); + registerModels(road_arrow_sr_yellow); + registerModels(road_arrow_sl_yellow); + registerModels(road_arrow_srl_yellow); + registerModels(road_crosswalk_yellow); + registerModels(road_excl_zone_yellow); + registerModels(road_excl_zone_line_yellow); + registerModels(road_excl_zone_corner_in_yellow); + registerModels(road_excl_zone_corner_out_yellow); + registerModels(road_excl_zone_diagonal_in_yellow); + registerModels(road_excl_zone_diagonal_out_yellow); + registerModels(road_excl_zone_split_in_l_yellow); + registerModels(road_excl_zone_split_in_r_yellow); + registerModels(road_excl_zone_split_out_l_yellow); + registerModels(road_excl_zone_split_out_r_yellow); registerModel(road_sidewalk); registerModel(road_guardrail); registerModel(road_sign_post); + registerModel(road_junction_marker); registerModel(road_sign_prohib_1); registerModel(road_sign_prohib_2); registerModel(road_sign_prohib_3a); @@ -988,6 +1097,24 @@ public static void registerModels() { registerModel(road_sign_info_17b); registerModel(road_sign_info_23); registerModel(road_sign_info_23b); + registerModel(road_sign_info_24); + registerModel(road_sign_info_25a); + registerModel(road_sign_info_25b); + registerModel(road_sign_info_26a); + registerModel(road_sign_info_26b); + registerModel(road_sign_info_26c); + registerModel(road_sign_info_27a); + registerModel(road_sign_info_27b); + registerModel(road_sign_info_27c); + registerModel(road_sign_info_28a); + registerModel(road_sign_info_28b); + + registerModel(road_sign_meta_1); + registerModel(road_sign_meta_2a); + registerModel(road_sign_meta_2b); + registerModel(road_sign_meta_2c); + registerModel(road_sign_meta_2d); + registerModel(road_sign_meta_2e); registerModel(road_lantern); registerModel(road_lantern_lit); @@ -995,23 +1122,26 @@ public static void registerModels() { registerModel(road_traffic_light); registerModel(road_traffic_light_manual); - registerModel(road_traffic_light_red); - registerModel(road_traffic_light_red_dyn); - - registerModel(road_traffic_light_yellow_fixed); - registerModel(road_traffic_light_yellow_dyn); - registerModel(road_traffic_light_yellow_blinking); - registerModel(road_traffic_light_green); - registerModel(road_traffic_light_green_dyn); - // registerModel(road_traffic_light_off); + registerModel(road_traffic_light_yellow); + registerModel(road_traffic_light_yellow_blinking); + registerModel(road_traffic_light_red); + registerModel(road_pedestrian_traffic_light); registerModel(road_pedestrian_traffic_light_manual); registerModel(road_pedestrian_traffic_light_green); registerModel(road_pedestrian_traffic_light_red); registerModel(road_pedestrian_traffic_light_off); registerModel(sign_printer); + + } + + @SideOnly(Side.CLIENT) + private static void registerModels(Block[] blocks) { + for (Block block : blocks) { + registerModel(block); + } } @SideOnly(Side.CLIENT) @@ -1023,12 +1153,13 @@ private static void registerModel(Block block) { @Mod.EventBusSubscriber() public static class RegistrationHandler { public static final List BLOCKS = new LinkedList<>(); - + @SubscribeEvent public static void registerItems(final RegistryEvent.Register event) { RoadBlocks.init(); RoadBlocks.register(); BLOCKS.stream().forEach(block -> event.getRegistry().register(block)); + } } } diff --git a/src/main/java/derfl007/roads/init/RoadCrafting.java b/src/main/java/derfl007/roads/init/RoadCrafting.java index 1c293a9..30bec5a 100644 --- a/src/main/java/derfl007/roads/init/RoadCrafting.java +++ b/src/main/java/derfl007/roads/init/RoadCrafting.java @@ -1,7 +1,11 @@ package derfl007.roads.init; +import java.util.LinkedList; +import java.util.List; + import derfl007.roads.Reference; -import derfl007.roads.common.blocks.BlockRoadRotatable; +import derfl007.roads.common.blocks.BlockRoad; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; @@ -9,9 +13,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import java.util.LinkedList; -import java.util.List; - public class RoadCrafting { public static void register() { @@ -22,11 +23,14 @@ public static void register() { public static class RegistrationHandler { public static final List RECIPES = new LinkedList<>(); + public static final List BLOCKS_ROAD = new LinkedList<>(); @SubscribeEvent public static void registerItems(final RegistryEvent.Register event) { RECIPES.stream().forEach(recipe -> event.getRegistry().register(recipe)); + + BLOCKS_ROAD.stream().forEach(blocks -> BlockRoad.registerRecipes(blocks)); //recipes to switch from one height to another } } } diff --git a/src/main/java/derfl007/roads/init/RoadItems.java b/src/main/java/derfl007/roads/init/RoadItems.java index bc8e090..9dc1339 100644 --- a/src/main/java/derfl007/roads/init/RoadItems.java +++ b/src/main/java/derfl007/roads/init/RoadItems.java @@ -1,8 +1,12 @@ package derfl007.roads.init; +import java.util.LinkedList; +import java.util.List; + import derfl007.roads.common.items.ItemColorCartridge; import derfl007.roads.common.items.ItemSignTemplate; import derfl007.roads.common.items.ItemTar; +import derfl007.roads.common.items.ItemTrafficRemote; import derfl007.roads.common.items.ItemWrench; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; @@ -11,74 +15,72 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import java.util.LinkedList; -import java.util.List; - public class RoadItems { - public static Item wrench; - public static Item tar; - public static Item round_sign_template; - public static Item triangle_sign_template; - public static Item square_sign_template; - public static Item magenta_ink_cartridge; - public static Item yellow_ink_cartridge; - public static Item cyan_ink_cartridge; + public static Item wrench; + public static Item trafficRemote; + public static Item tar; + public static Item round_sign_template; + public static Item triangle_sign_template; + public static Item square_sign_template; + public static Item magenta_ink_cartridge; + public static Item yellow_ink_cartridge; + public static Item cyan_ink_cartridge; - public static void init() { - wrench = new ItemWrench(); - tar = new ItemTar(); - round_sign_template = new ItemSignTemplate("round_sign_template"); - triangle_sign_template = new ItemSignTemplate("triangle_sign_template"); - square_sign_template = new ItemSignTemplate("square_sign_template"); - magenta_ink_cartridge = new ItemColorCartridge("magenta_ink_cartridge"); - yellow_ink_cartridge = new ItemColorCartridge("yellow_ink_cartridge"); - cyan_ink_cartridge = new ItemColorCartridge("cyan_ink_cartridge"); - } + public static void init() { + wrench = new ItemWrench(); + trafficRemote = new ItemTrafficRemote(); + tar = new ItemTar(); + round_sign_template = new ItemSignTemplate("round_sign_template"); + triangle_sign_template = new ItemSignTemplate("triangle_sign_template"); + square_sign_template = new ItemSignTemplate("square_sign_template"); + magenta_ink_cartridge = new ItemColorCartridge("magenta_ink_cartridge"); + yellow_ink_cartridge = new ItemColorCartridge("yellow_ink_cartridge"); + cyan_ink_cartridge = new ItemColorCartridge("cyan_ink_cartridge"); + } - public static void register() - { - registerItem(wrench); - registerItem(tar); - registerItem(round_sign_template); - registerItem(square_sign_template); - registerItem(triangle_sign_template); - registerItem(magenta_ink_cartridge); - registerItem(yellow_ink_cartridge); - registerItem(cyan_ink_cartridge); - } + public static void register() { + registerItem(wrench); + registerItem(trafficRemote); + registerItem(tar); + registerItem(round_sign_template); + registerItem(square_sign_template); + registerItem(triangle_sign_template); + registerItem(magenta_ink_cartridge); + registerItem(yellow_ink_cartridge); + registerItem(cyan_ink_cartridge); + } - public static void registerItem(Item item) - { - RegistrationHandler.ITEMS.add(item); - } + public static void registerItem(Item item) { + RegistrationHandler.ITEMS.add(item); + } - public static void registerModels() { - registerModel(wrench); - registerModel(tar); - registerModel(round_sign_template); - registerModel(square_sign_template); - registerModel(triangle_sign_template); - registerModel(magenta_ink_cartridge); - registerModel(yellow_ink_cartridge); - registerModel(cyan_ink_cartridge); - } + public static void registerModels() { + registerModel(wrench); + registerModel(trafficRemote); + registerModel(tar); + registerModel(round_sign_template); + registerModel(square_sign_template); + registerModel(triangle_sign_template); + registerModel(magenta_ink_cartridge); + registerModel(yellow_ink_cartridge); + registerModel(cyan_ink_cartridge); + } - public static void registerModel(Item item) { - ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); - } + public static void registerModel(Item item) { + ModelLoader.setCustomModelResourceLocation(item, 0, + new ModelResourceLocation(item.getRegistryName(), "inventory")); + } - @Mod.EventBusSubscriber() - public static class RegistrationHandler - { - public static final List ITEMS = new LinkedList<>(); + @Mod.EventBusSubscriber() + public static class RegistrationHandler { + public static final List ITEMS = new LinkedList<>(); - @SubscribeEvent - public static void registerItems(final RegistryEvent.Register event) - { - RoadItems.init(); - RoadItems.register(); - ITEMS.stream().forEach(item -> event.getRegistry().register(item)); - } - } + @SubscribeEvent + public static void registerItems(final RegistryEvent.Register event) { + RoadItems.init(); + RoadItems.register(); + ITEMS.stream().forEach(item -> event.getRegistry().register(item)); + } + } } diff --git a/src/main/java/derfl007/roads/init/RoadTileEntities.java b/src/main/java/derfl007/roads/init/RoadTileEntities.java index 8a6b6b9..5cdf507 100644 --- a/src/main/java/derfl007/roads/init/RoadTileEntities.java +++ b/src/main/java/derfl007/roads/init/RoadTileEntities.java @@ -11,7 +11,5 @@ public static void register() { GameRegistry.registerTileEntity(TileEntityRoadTownSign.class, Reference.MOD_ID + ":road_town_sign"); GameRegistry.registerTileEntity(TileEntityRoadLantern.class, Reference.MOD_ID + ":road_lantern"); GameRegistry.registerTileEntity(TileEntitySignPrinter.class, Reference.MOD_ID + ":sign_printer"); - - System.out.println("tile entitiies registered!"); } } \ No newline at end of file diff --git a/src/main/java/derfl007/roads/models/BaseBakedModel.java b/src/main/java/derfl007/roads/models/BaseBakedModel.java new file mode 100644 index 0000000..3c88d7f --- /dev/null +++ b/src/main/java/derfl007/roads/models/BaseBakedModel.java @@ -0,0 +1,104 @@ +package derfl007.roads.models; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; + +import javax.annotation.Nullable; + +import derfl007.roads.Reference; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelRotation; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.common.model.IModelState; + +public abstract class BaseBakedModel implements IBakedModel { + + private final VertexFormat format; + private final Function bakedTextureGetter; + + protected BaseBakedModel(BaseBakedModel parentModel) { + this.format = parentModel.format; + this.bakedTextureGetter = parentModel.bakedTextureGetter; + } + + protected BaseBakedModel(VertexFormat format, Function bakedTextureGetter) { + this.format = format; + this.bakedTextureGetter = bakedTextureGetter; + } + + protected final List getQuads(@Nullable IModel model, IModelState modelState, + @Nullable IBlockState state, @Nullable EnumFacing side, long rand) { + if (model != null) { + if (modelState == null) { + modelState = model.getDefaultState(); + } + IBakedModel bakedModel = model.bake(modelState, format, bakedTextureGetter); + if (bakedModel != null) + return bakedModel.getQuads(state, side, rand); + } + return new ArrayList<>(); + } + + @Override + public final boolean isAmbientOcclusion() { + // TODO Auto-generated method stub + return true; + } + + @Override + public final boolean isGui3d() { + // TODO Auto-generated method stub + return false; + } + + @Override + public final boolean isBuiltInRenderer() { + // TODO Auto-generated method stub + return false; + } + + @Nullable + protected static final IModel getModel(String[] modelsPath, IModel[] models, int modelIndex) { + if (models[modelIndex] == null) { + try { + models[modelIndex] = ModelLoaderRegistry + .getModel(new ResourceLocation(Reference.MOD_ID, modelsPath[modelIndex])); + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return models[modelIndex]; + } + + protected IModelState getModelState(EnumFacing facing) { + + switch (facing) { + case WEST: + return ModelRotation.X0_Y90; + + case NORTH: + return ModelRotation.X0_Y180; + + case EAST: + return ModelRotation.X0_Y270; + + default: + return ModelRotation.X0_Y0; + } + } + +/* protected List translate(List quads, int translX, int translY, int translZ) { + + }*/ + +} diff --git a/src/main/java/derfl007/roads/models/BaseModel.java b/src/main/java/derfl007/roads/models/BaseModel.java new file mode 100644 index 0000000..c076322 --- /dev/null +++ b/src/main/java/derfl007/roads/models/BaseModel.java @@ -0,0 +1,53 @@ +package derfl007.roads.models; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import derfl007.roads.Reference; +import derfl007.roads.common.blocks.BlockRoadSignRotatable; +import derfl007.roads.models.signs.BaseSignBakedModel; +import derfl007.roads.models.signs.TrafficLightsBakedModel; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; + +public abstract class BaseModel implements IModel { + + private final Set DEPENDENCIES; + private final Set TEXTURES; + + public BaseModel() { + HashSet set = new HashSet<>(); + + for (String model : BaseSignBakedModel.getModelsPath()) { + set.add(new ResourceLocation(Reference.MOD_ID, model)); + } + + DEPENDENCIES = Collections.unmodifiableSet(set); + + set = new HashSet<>(); + for (String texture : BlockRoadSignRotatable.getRegisteredTextures()) { + set.add(new ResourceLocation(Reference.MOD_ID, "blocks/" + texture)); + } + set.add(new ResourceLocation(TrafficLightsBakedModel.TEXTURE_GREEN_OFF)); + set.add(new ResourceLocation(TrafficLightsBakedModel.TEXTURE_GREEN_ON)); + set.add(new ResourceLocation(TrafficLightsBakedModel.TEXTURE_YELLOW_OFF)); + set.add(new ResourceLocation(TrafficLightsBakedModel.TEXTURE_YELLOW_ON)); + set.add(new ResourceLocation(TrafficLightsBakedModel.TEXTURE_RED_ON)); + set.add(new ResourceLocation(TrafficLightsBakedModel.TEXTURE_RED_OFF)); + set.add(new ResourceLocation(TrafficLightsBakedModel.TEXTURE_YELLOW_BLINKING)); + + TEXTURES = Collections.unmodifiableSet(set); + } + + @Override + public final Collection getDependencies() { + return DEPENDENCIES; + } + + @Override + public final Collection getTextures() { + return TEXTURES; + } +} diff --git a/src/main/java/derfl007/roads/models/RoadBakedModel.java b/src/main/java/derfl007/roads/models/RoadBakedModel.java new file mode 100644 index 0000000..134b660 --- /dev/null +++ b/src/main/java/derfl007/roads/models/RoadBakedModel.java @@ -0,0 +1,173 @@ +package derfl007.roads.models; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; + +import derfl007.roads.Reference; +import derfl007.roads.common.blocks.BlockRoad; +import derfl007.roads.render.AxisAlignedRectangleSettings; +import derfl007.roads.render.Quad; +import derfl007.roads.render.ShapeUtil; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.Vec3d; +import net.minecraftforge.common.property.IExtendedBlockState; + +public class RoadBakedModel implements IBakedModel { + + private static final RoadItemOverrideList itemOverride = new RoadItemOverrideList(); + + protected final VertexFormat format; + protected final Function bakedTextureGetter; + + RoadBakedModel(VertexFormat format, Function bakedTextureGetter) { + this.format = format; + this.bakedTextureGetter = bakedTextureGetter; + } + + protected RoadBakedModel(RoadBakedModel parentModel) { + this.format = parentModel.format; + this.bakedTextureGetter = parentModel.bakedTextureGetter; + } + + protected TextureAtlasSprite getTexture(String name) { + return bakedTextureGetter.apply(new ResourceLocation(Reference.MOD_ID, name)); + } + + @Override + public List getQuads(IBlockState state, EnumFacing side, long rand) { + // TODO Auto-generated method stub + + List quads = new ArrayList<>(); + if (state == null || !(state instanceof IExtendedBlockState)) { + return quads; + } + + IExtendedBlockState extendedState = (IExtendedBlockState) state; + + BlockRoad block = (BlockRoad) extendedState.getBlock(); + EnumFacing facing = extendedState.getValue(BlockRoad.FACING); + EnumFacing textureFacing = extendedState.getValue(BlockRoad.TEXTURE_ROTATION); + boolean slope = extendedState.getValue(BlockRoad.SLOPE); + float slopeBottom = extendedState.getValue(BlockRoad.SLOPE_BOTTOM); + float blockBottom = Math.min(slopeBottom, 0F); + + float height = extendedState.getValue(BlockRoad.HEIGHT); + + TextureAtlasSprite roadSprite = getTexture("blocks/road"); + TextureAtlasSprite specificTexture = block.getTextureSprite(extendedState, bakedTextureGetter); + + Quad bottom = ShapeUtil.createAxisAlignedRectangle(EnumFacing.DOWN, + new AxisAlignedRectangleSettings().setOffset(blockBottom), roadSprite, format); + quads.add(bottom.bake()); + + Quad top; + if (slope) { + + TextureAtlasSprite slopeLeftSprite = getTexture("blocks/road_slope_left"); + TextureAtlasSprite slopeRightSprite = getTexture("blocks/road_slope_right"); + + BakedQuad back = ShapeUtil.createAxisAlignedRectangle(facing.getOpposite(), + new AxisAlignedRectangleSettings().setBottom(blockBottom).setHeight(height - blockBottom), + roadSprite, format).bake(); + quads.add(back); + + if (slopeBottom > blockBottom) { + AxisAlignedRectangleSettings bottomSettings = new AxisAlignedRectangleSettings().setBottom(blockBottom) + .setHeight(slopeBottom - blockBottom); + + BakedQuad leftBottom = ShapeUtil + .createAxisAlignedRectangle(facing.rotateY(), bottomSettings, roadSprite, format).bake(); + quads.add(leftBottom); + + BakedQuad rightBottom = ShapeUtil + .createAxisAlignedRectangle(facing.rotateYCCW(), bottomSettings, roadSprite, format).bake(); + quads.add(rightBottom); + } + + AxisAlignedRectangleSettings slopeSettings = new AxisAlignedRectangleSettings().setBottom(slopeBottom) + .setHeight(height - slopeBottom); + + Quad leftSlope = ShapeUtil.createAxisAlignedRectangle(facing.rotateY(), slopeSettings, slopeLeftSprite, + format); + leftSlope.fillTexture(); + quads.add(leftSlope.bake()); + + Quad rightSlope = ShapeUtil.createAxisAlignedRectangle(facing.rotateYCCW(), slopeSettings, slopeRightSprite, + format); + rightSlope.fillTexture(); + quads.add(rightSlope.bake()); + + top = new Quad(new Vec3d(0, height, 0), new Vec3d(0, slopeBottom, 1), new Vec3d(1, slopeBottom, 1), + new Vec3d(1, height, 0), specificTexture, format); + top.fillTexture(); + + top.rotateY(-facing.getHorizontalIndex() * 90); + for (int i = 0; i < (textureFacing.getHorizontalIndex() + 2) % 4; i++) { + top.rotateTexture90Clockwise(); + } + } else { + + AxisAlignedRectangleSettings settings = new AxisAlignedRectangleSettings().setHeight(height); + + BakedQuad east = ShapeUtil.createAxisAlignedRectangle(EnumFacing.EAST, settings, roadSprite, format).bake(); + BakedQuad west = ShapeUtil.createAxisAlignedRectangle(EnumFacing.WEST, settings, roadSprite, format).bake(); + BakedQuad south = ShapeUtil.createAxisAlignedRectangle(EnumFacing.SOUTH, settings, roadSprite, format) + .bake(); + BakedQuad north = ShapeUtil.createAxisAlignedRectangle(EnumFacing.NORTH, settings, roadSprite, format) + .bake(); + top = ShapeUtil.createAxisAlignedRectangle(EnumFacing.UP, + new AxisAlignedRectangleSettings().setOffset(1D - height), specificTexture, format); + + quads.add(east); + quads.add(west); + quads.add(south); + quads.add(north); + for (int i = 0; i < (textureFacing.getHorizontalIndex() + facing.getHorizontalIndex() + 2) % 4; i++) { + top.rotateTexture90Clockwise(); + } + } + + quads.add(top.bake()); + + return quads; + } + + @Override + public final TextureAtlasSprite getParticleTexture() { + // TODO Auto-generated method stub + return getTexture("blocks/road"); + } + + @Override + public ItemOverrideList getOverrides() { + // TODO Auto-generated method stub + return itemOverride; + } + + @Override + public final boolean isAmbientOcclusion() { + // TODO Auto-generated method stub + return false; + } + + @Override + public final boolean isGui3d() { + // TODO Auto-generated method stub + return true; + } + + @Override + public final boolean isBuiltInRenderer() { + // TODO Auto-generated method stub + return false; + } + +} diff --git a/src/main/java/derfl007/roads/models/RoadItemBakedModel.java b/src/main/java/derfl007/roads/models/RoadItemBakedModel.java new file mode 100644 index 0000000..3f2a964 --- /dev/null +++ b/src/main/java/derfl007/roads/models/RoadItemBakedModel.java @@ -0,0 +1,71 @@ +package derfl007.roads.models; + +import java.util.ArrayList; +import java.util.List; + +import derfl007.roads.common.blocks.BlockRoad; +import derfl007.roads.render.AxisAlignedRectangleSettings; +import derfl007.roads.render.Quad; +import derfl007.roads.render.ShapeUtil; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.EnumFacing; + +public class RoadItemBakedModel extends RoadBakedModel { + + private final BlockRoad block; + + RoadItemBakedModel(RoadBakedModel parentModel, BlockRoad block) { + super(parentModel); + this.block = block; + } + + @Override + public ItemOverrideList getOverrides() { + // TODO Auto-generated method stub + throw new IllegalStateException(); + } + + @Override + public List getQuads(IBlockState state, EnumFacing side, long rand) { + // TODO Auto-generated method stub + + List quads = new ArrayList<>(); + + float height = (float) block.getHeight(); + + TextureAtlasSprite roadSprite = getTexture("blocks/road"); + TextureAtlasSprite specificTexture = block.getTextureSprite(null, bakedTextureGetter); + + List unbakedQuads = new ArrayList<>(); + + AxisAlignedRectangleSettings slopeSettings = new AxisAlignedRectangleSettings().setHeight(height); + Quad bottom = ShapeUtil.createAxisAlignedRectangle(EnumFacing.DOWN, slopeSettings, roadSprite, format); + Quad west = ShapeUtil.createAxisAlignedRectangle(EnumFacing.WEST, slopeSettings, roadSprite, format); + Quad east = ShapeUtil.createAxisAlignedRectangle(EnumFacing.EAST, slopeSettings, roadSprite, format); + Quad north = ShapeUtil.createAxisAlignedRectangle(EnumFacing.NORTH, slopeSettings, roadSprite, format); + Quad south = ShapeUtil.createAxisAlignedRectangle(EnumFacing.SOUTH, slopeSettings, roadSprite, format); + + Quad top = ShapeUtil.createAxisAlignedRectangle(EnumFacing.UP, + new AxisAlignedRectangleSettings().setOffset(1D - height), specificTexture, format); + + unbakedQuads.add(bottom); + unbakedQuads.add(west); + unbakedQuads.add(east); + unbakedQuads.add(north); + unbakedQuads.add(top); + unbakedQuads.add(south); + + for (Quad quad : unbakedQuads) { + quad.rotateY(45); + quad.rotateX(30); + quad.scale(0.62); + + quads.add(quad.bake()); + } + + return quads; + } +} diff --git a/src/main/java/derfl007/roads/models/RoadItemOverrideList.java b/src/main/java/derfl007/roads/models/RoadItemOverrideList.java new file mode 100644 index 0000000..0babb74 --- /dev/null +++ b/src/main/java/derfl007/roads/models/RoadItemOverrideList.java @@ -0,0 +1,33 @@ +package derfl007.roads.models; + +import java.util.ArrayList; + +import javax.annotation.Nullable; + +import derfl007.roads.common.blocks.BlockRoad; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemOverride; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class RoadItemOverrideList extends ItemOverrideList { + + public RoadItemOverrideList() { + super(new ArrayList()); + } + + @Override + public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, @Nullable World world, + @Nullable EntityLivingBase entity) { + if (originalModel instanceof RoadBakedModel && !stack.isEmpty()) { + Block block = Block.getBlockFromItem(stack.getItem()); + if (block != null && block instanceof BlockRoad) { + return new RoadItemBakedModel((RoadBakedModel) originalModel, (BlockRoad) block); + } + } + return originalModel; + } +} diff --git a/src/main/java/derfl007/roads/models/RoadLineBakedModel.java b/src/main/java/derfl007/roads/models/RoadLineBakedModel.java new file mode 100644 index 0000000..3c98ba4 --- /dev/null +++ b/src/main/java/derfl007/roads/models/RoadLineBakedModel.java @@ -0,0 +1,110 @@ +package derfl007.roads.models; + +import java.util.List; +import java.util.function.Function; + +import derfl007.roads.common.blocks.BlockRoad; +import derfl007.roads.common.blocks.BlockRoadLine; +import derfl007.roads.render.Quad; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.Vec3d; +import net.minecraftforge.common.property.IExtendedBlockState; + +public class RoadLineBakedModel extends RoadBakedModel { + + private class AutoVec3d { + + private final BlockRoad block; + private final boolean slope; + private final float height; + private final float slopeBottom; + private final EnumFacing facing; + + public AutoVec3d(BlockRoad block, EnumFacing facing, float height, boolean slope, float slopeBottom) { + this.block = block; + this.slope = slope; + this.height = height; + this.slopeBottom = slopeBottom; + this.facing = facing; + } + + public Vec3d create(double xIn, double zIn) { + xIn /= 16d; + zIn /= 16d; + + // increment by 0.005 to avoid flickering due to + // interference with the underneath road texture. + return new Vec3d(xIn, block.getHeightAtPosition(facing, height, slope, slopeBottom, xIn, zIn) + 0.005, zIn); + } + + } + + RoadLineBakedModel(VertexFormat format, Function bakedTextureGetter) { + super(format, bakedTextureGetter); + } + + @Override + public List getQuads(IBlockState state, EnumFacing side, long rand) { + // TODO Auto-generated method stub + + // state may not be null; item rendering is done by RoadBakedModel + List quads = super.getQuads(state, side, rand); + + IExtendedBlockState extendedState = (IExtendedBlockState) state; + + BlockRoadLine block = (BlockRoadLine) extendedState.getBlock(); + boolean yellow = block.isYellow(); + + boolean slope = extendedState.getValue(BlockRoad.SLOPE); + float height = extendedState.getValue(BlockRoad.HEIGHT); + + float slopeBottom = extendedState.getValue(BlockRoad.SLOPE_BOTTOM); + EnumFacing facing = extendedState.getValue(BlockRoad.FACING); + + boolean south = extendedState.getValue(BlockRoadLine.SOUTH); + boolean east = extendedState.getValue(BlockRoadLine.EAST); + boolean north = extendedState.getValue(BlockRoadLine.NORTH); + boolean west = extendedState.getValue(BlockRoadLine.WEST); + + TextureAtlasSprite roadLineSprite = yellow ? getTexture("blocks/road_yellow") : getTexture("blocks/road_white"); + + AutoVec3d vecCreator = new AutoVec3d(block, facing, height, slope, slopeBottom); + + Quad mid = new Quad(vecCreator.create(6, 10), vecCreator.create(10, 10), vecCreator.create(10, 6), + vecCreator.create(6, 6), roadLineSprite, format); + quads.add(mid.bake()); + + if (south) { + Quad line = new Quad(vecCreator.create(6, 10), vecCreator.create(6, 16), vecCreator.create(10, 16), + vecCreator.create(10, 10), roadLineSprite, format); + + quads.add(line.bake()); + } + if (north) { + Quad line = new Quad(vecCreator.create(6, 0), vecCreator.create(6, 6), vecCreator.create(10, 6), + vecCreator.create(10, 0), roadLineSprite, format); + + quads.add(line.bake()); + } + if (west) { + Quad line = new Quad(vecCreator.create(0, 6), vecCreator.create(0, 10), vecCreator.create(6, 10), + vecCreator.create(6, 6), roadLineSprite, format); + + quads.add(line.bake()); + } + if (east) { + Quad line = new Quad(vecCreator.create(10, 6), vecCreator.create(10, 10), vecCreator.create(16, 10), + vecCreator.create(16, 6), roadLineSprite, format); + + quads.add(line.bake()); + } + + return quads; + } + +} diff --git a/src/main/java/derfl007/roads/models/RoadLineModel.java b/src/main/java/derfl007/roads/models/RoadLineModel.java new file mode 100644 index 0000000..994aa12 --- /dev/null +++ b/src/main/java/derfl007/roads/models/RoadLineModel.java @@ -0,0 +1,51 @@ +package derfl007.roads.models; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Function; + +import derfl007.roads.Reference; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.common.model.IModelState; + +public class RoadLineModel implements IModel{ + + private final Set DEPENDENCIES; + private final Set TEXTURES; + + @Override + public IBakedModel bake(IModelState state, VertexFormat format, + Function bakedTextureGetter) { + // TODO Auto-generated method stub + return new RoadLineBakedModel(format, bakedTextureGetter); + } + + RoadLineModel() { + HashSet set = new HashSet<>(); + + DEPENDENCIES = Collections.unmodifiableSet(set); + + set = new HashSet<>(); + set.add(new ResourceLocation(Reference.MOD_ID, "blocks/road")); + set.add(new ResourceLocation(Reference.MOD_ID, "blocks/road_white")); + set.add(new ResourceLocation(Reference.MOD_ID, "blocks/road_yellow")); + + TEXTURES = Collections.unmodifiableSet(set); + } + + @Override + public final Collection getDependencies() { + return DEPENDENCIES; + } + + @Override + public final Collection getTextures() { + return TEXTURES; + } +} diff --git a/src/main/java/derfl007/roads/models/RoadModel.java b/src/main/java/derfl007/roads/models/RoadModel.java new file mode 100644 index 0000000..54167bb --- /dev/null +++ b/src/main/java/derfl007/roads/models/RoadModel.java @@ -0,0 +1,54 @@ +package derfl007.roads.models; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Function; + +import derfl007.roads.Reference; +import derfl007.roads.common.blocks.BlockRoad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.common.model.IModelState; + +public class RoadModel implements IModel { + + private final Set DEPENDENCIES; + private final Set TEXTURES; + + @Override + public IBakedModel bake(IModelState state, VertexFormat format, + Function bakedTextureGetter) { + // TODO Auto-generated method stub + return new RoadBakedModel(format, bakedTextureGetter); + } + + RoadModel() { + HashSet set = new HashSet<>(); + DEPENDENCIES = Collections.unmodifiableSet(set); + + set = new HashSet<>(); + for (String texture : BlockRoad.getRegisteredTextures()) { + set.add(new ResourceLocation(Reference.MOD_ID, "blocks/" + texture)); + } + set.add(new ResourceLocation(Reference.MOD_ID, "blocks/road")); + set.add(new ResourceLocation(Reference.MOD_ID, "blocks/road_slope_right")); + set.add(new ResourceLocation(Reference.MOD_ID, "blocks/road_slope_left")); + + TEXTURES = Collections.unmodifiableSet(set); + } + + @Override + public final Collection getDependencies() { + return DEPENDENCIES; + } + + @Override + public final Collection getTextures() { + return TEXTURES; + } +} diff --git a/src/main/java/derfl007/roads/models/RoadSignModelLoader.java b/src/main/java/derfl007/roads/models/RoadSignModelLoader.java new file mode 100644 index 0000000..a0318d1 --- /dev/null +++ b/src/main/java/derfl007/roads/models/RoadSignModelLoader.java @@ -0,0 +1,62 @@ +package derfl007.roads.models; + +import derfl007.roads.Reference; +import derfl007.roads.common.blocks.BlockRoad; +import derfl007.roads.models.signs.RoadSignModel; +import derfl007.roads.models.signs.TrafficLightsModel; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ICustomModelLoader; +import net.minecraftforge.client.model.IModel; + +public class RoadSignModelLoader implements ICustomModelLoader { + + private final RoadSignModel signModel = new RoadSignModel(); + private final TrafficLightsModel trafficLightsModel = new TrafficLightsModel(); + private final RoadLineModel roadLineModel = new RoadLineModel(); + private final RoadModel roadModel = new RoadModel(); + + @Override + public void onResourceManagerReload(IResourceManager resourceManager) { + // TODO Auto-generated method stub + } + + @Override + public boolean accepts(ResourceLocation modelLocation) { + // TODO Auto-generated method stub + if (Reference.MOD_ID.equals(modelLocation.getResourceDomain()) && modelLocation.getResourcePath() != null) { + if (modelLocation.getResourcePath().startsWith("road_sign_") + && !"road_sign_post".equals(modelLocation.getResourcePath())) { + return true; + } + if (modelLocation.getResourcePath().contains("traffic_light") + && !modelLocation.getResourcePath().contains("model") + && !modelLocation.getResourcePath().contains("auto")) { + return true; + } + if (BlockRoad.getRegisteredBlocks().contains(modelLocation.getResourcePath())) { + return true; + } + return modelLocation.getResourcePath().startsWith("road_line"); + } + return false; + + } + + @Override + public IModel loadModel(ResourceLocation modelLocation) throws Exception { + // TODO Auto-generated method stub + + if (modelLocation.getResourcePath().contains("traffic_light")) { + return trafficLightsModel; + } + if (BlockRoad.getRegisteredBlocks().contains(modelLocation.getResourcePath())) { + return roadModel; + } + if (modelLocation.getResourcePath().startsWith("road_sign_")) { + return signModel; + } + return roadLineModel; + } + +} diff --git a/src/main/java/derfl007/roads/models/signs/BaseSignBakedModel.java b/src/main/java/derfl007/roads/models/signs/BaseSignBakedModel.java new file mode 100644 index 0000000..08811f2 --- /dev/null +++ b/src/main/java/derfl007/roads/models/signs/BaseSignBakedModel.java @@ -0,0 +1,163 @@ +package derfl007.roads.models.signs; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; + +import javax.annotation.Nullable; + +import com.google.common.collect.ImmutableList; + +import derfl007.roads.common.blocks.IBlockConnectable; +import derfl007.roads.common.util.BlockStateUtil; +import derfl007.roads.models.BaseBakedModel; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelRotation; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.common.model.IModelState; +import net.minecraftforge.common.property.IExtendedBlockState; + +public abstract class BaseSignBakedModel extends BaseBakedModel { + + private static final String[] MODELS_PATH = { "block/road_sign", "block/road_sign_1", "block/road_sign_2", + "block/road_sign_3", "block/road_traffic_light_model", "block/road_pedestrian_traffic_light_model", + "block/road_sign_connector" }; + + protected static final int TRAFFIC_LIGHTS_INDEX = 4; + protected static final int PEDESTRIAN_TRAFFIC_LIGHTS_INDEX = 5; + protected static final int CONNECTOR_INDEX = MODELS_PATH.length - 1; + + public static final ImmutableList getModelsPath() { + return ImmutableList.copyOf(MODELS_PATH); + } + + private static final IModel[] MODELS = new IModel[MODELS_PATH.length]; + + protected BaseSignBakedModel(BaseSignBakedModel parentModel) { + super(parentModel); + } + + BaseSignBakedModel(VertexFormat format, Function bakedTextureGetter) { + super(format, bakedTextureGetter); + } + + protected final IModel retexture(IModel model, @Nullable IBlockState state) { + if (state == null) { + return retexture(model); + } + try { + + T block = (T) state.getBlock(); + return retexture(model, block); + + } catch (ClassCastException ex) { + ex.printStackTrace(); + return retexture(model); + } + + } + + /** + * To be overridden in subclasses. + * + * @param model + * @return + */ + @Deprecated + protected IModel retexture(IModel model) { + return model; + } + + protected abstract IModel retexture(IModel model, T block); + + @Nullable + protected final IModel getModel(int modelIndex) { + return getModel(MODELS_PATH, MODELS, modelIndex); + } + + @Nullable + protected abstract IModel getModel(@Nullable IBlockState state); + + protected abstract IModelState getModelState(IModel model, @Nullable IBlockState state); + + protected boolean shouldConnectTo(IBlockState state, EnumFacing side) { + // TODO Auto-generated method stub + if (!(state instanceof IExtendedBlockState)) { + return false; + } + + IExtendedBlockState extendedState = (IExtendedBlockState) state; + + switch (side) { + case UP: + return BlockStateUtil.optGetValue(extendedState, IBlockConnectable.UP, false); + case DOWN: + return BlockStateUtil.optGetValue(extendedState, IBlockConnectable.DOWN, false); + case EAST: + return BlockStateUtil.optGetValue(extendedState, IBlockConnectable.EAST, false); + case WEST: + return BlockStateUtil.optGetValue(extendedState, IBlockConnectable.WEST, false); + case SOUTH: + return BlockStateUtil.optGetValue(extendedState, IBlockConnectable.SOUTH, false); + case NORTH: + return BlockStateUtil.optGetValue(extendedState, IBlockConnectable.NORTH, false); + } + return false; + } + + @Override + public final List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { + // TODO Auto-generated method stub + + IBakedModel fallbackModel = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes() + .getModelManager().getMissingModel(); + + IModel model = getModel(state); + if (model == null) { + return fallbackModel.getQuads(state, side, rand); + } + + IModelState modelState = getModelState(model, state); + + model = retexture(model, state); + + final List quads = new ArrayList<>(); + + IModel modelConnector = getModel(CONNECTOR_INDEX); + if (state != null && modelConnector != null) { + modelConnector.uvlock(true); + if (shouldConnectTo(state, EnumFacing.UP)) { + quads.addAll(getQuads(modelConnector, ModelRotation.X180_Y0, state, side, rand)); + } + if (shouldConnectTo(state, EnumFacing.DOWN)) { + quads.addAll(getQuads(modelConnector, ModelRotation.X0_Y0, state, side, rand)); + } + if (shouldConnectTo(state, EnumFacing.NORTH)) { + quads.addAll(getQuads(modelConnector, ModelRotation.X90_Y180, state, side, rand)); + } + if (shouldConnectTo(state, EnumFacing.SOUTH)) { + quads.addAll(getQuads(modelConnector, ModelRotation.X90_Y0, state, side, rand)); + } + if (shouldConnectTo(state, EnumFacing.EAST)) { + quads.addAll(getQuads(modelConnector, ModelRotation.X90_Y270, state, side, rand)); + } + if (shouldConnectTo(state, EnumFacing.WEST)) { + quads.addAll(getQuads(modelConnector, ModelRotation.X90_Y90, state, side, rand)); + } + } + + quads.addAll(getQuads(model, modelState, state, side, rand)); + + return quads; + + } + +} \ No newline at end of file diff --git a/src/main/java/derfl007/roads/models/signs/RoadSignBakedModel.java b/src/main/java/derfl007/roads/models/signs/RoadSignBakedModel.java new file mode 100644 index 0000000..5f3709d --- /dev/null +++ b/src/main/java/derfl007/roads/models/signs/RoadSignBakedModel.java @@ -0,0 +1,102 @@ +package derfl007.roads.models.signs; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; + +import javax.annotation.Nullable; + +import com.google.common.collect.ImmutableMap; + +import derfl007.roads.Reference; +import derfl007.roads.common.blocks.BlockRoadSignRotatable; +import derfl007.roads.common.util.SignOrientation; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.block.model.ModelRotation; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.common.model.IModelState; + +public class RoadSignBakedModel extends BaseSignBakedModel { + + RoadSignBakedModel(VertexFormat format, Function bakedTextureGetter) { + super(format, bakedTextureGetter); + } + + protected RoadSignBakedModel(RoadSignBakedModel parentModel) { + super(parentModel); + } + + private static final RoadSignItemOverride itemOverride = new RoadSignItemOverride(); + + @Override + @Nullable + protected final IModel getModel(@Nullable IBlockState state) { + int modelIndex = 0; + + if (state != null) { + final int rotation = state.getValue(BlockRoadSignRotatable.ORIENTATION); + modelIndex = rotation % 4; + } + return getModel(modelIndex); + + } + + @Override + protected IModelState getModelState(IModel model, @Nullable IBlockState state) { + + if (state == null) { + return model.getDefaultState(); + } + + final int rotation = state.getValue(BlockRoadSignRotatable.ORIENTATION); + + return getModelState(SignOrientation.toFacing(rotation)); + } + + @Override + protected final IModel retexture(IModel model, BlockRoadSignRotatable block) { + Map textures = new HashMap<>(); + textures.put("front", "df-roads:blocks/" + block.getFrontTexturePath()); + textures.put("back", "df-roads:blocks/" + block.getBackTexturePath()); + model = model.retexture(ImmutableMap.copyOf(textures)); + + return model; + } + + @Override + public final TextureAtlasSprite getParticleTexture() { + // TODO Auto-generated method stub + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(Reference.MOD_ID + ":blocks/metal"); + } + + @Override + public ItemOverrideList getOverrides() { + // TODO Auto-generated method stub + return itemOverride; + } + + @Override + protected IModelState getModelState(EnumFacing facing) { + + switch (facing) { + case WEST: + return ModelRotation.X0_Y270; + + case NORTH: + return ModelRotation.X0_Y180; + + case EAST: + return ModelRotation.X0_Y90; + + default: + return ModelRotation.X0_Y0; + } + } + +} diff --git a/src/main/java/derfl007/roads/models/signs/RoadSignItemBakedModel.java b/src/main/java/derfl007/roads/models/signs/RoadSignItemBakedModel.java new file mode 100644 index 0000000..7659657 --- /dev/null +++ b/src/main/java/derfl007/roads/models/signs/RoadSignItemBakedModel.java @@ -0,0 +1,29 @@ +package derfl007.roads.models.signs; + +import derfl007.roads.common.blocks.BlockRoadSignRotatable; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraftforge.client.model.IModel; + +public class RoadSignItemBakedModel extends RoadSignBakedModel { + + private final BlockRoadSignRotatable block; + + RoadSignItemBakedModel(RoadSignBakedModel parentModel, BlockRoadSignRotatable block) { + super(parentModel); + + this.block = block; + } + + @Override + protected final IModel retexture(IModel model) { + return retexture(model, block); + } + + @Deprecated() + @Override + public ItemOverrideList getOverrides() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException(); + } + +} diff --git a/src/main/java/derfl007/roads/models/signs/RoadSignItemOverride.java b/src/main/java/derfl007/roads/models/signs/RoadSignItemOverride.java new file mode 100644 index 0000000..f3462a8 --- /dev/null +++ b/src/main/java/derfl007/roads/models/signs/RoadSignItemOverride.java @@ -0,0 +1,34 @@ +package derfl007.roads.models.signs; + +import java.util.ArrayList; + +import javax.annotation.Nullable; + +import derfl007.roads.common.blocks.BlockRoadSignRotatable; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemOverride; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class RoadSignItemOverride extends ItemOverrideList { + + public RoadSignItemOverride() { + super(new ArrayList()); + } + + @Override + public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, @Nullable World world, + @Nullable EntityLivingBase entity) { + if (originalModel instanceof RoadSignBakedModel && !stack.isEmpty()) { + Block block = Block.getBlockFromItem(stack.getItem()); + if (block != null && block instanceof BlockRoadSignRotatable) { + return new RoadSignItemBakedModel((RoadSignBakedModel) originalModel, (BlockRoadSignRotatable) block); + } + } + return originalModel; + } + +} diff --git a/src/main/java/derfl007/roads/models/signs/RoadSignModel.java b/src/main/java/derfl007/roads/models/signs/RoadSignModel.java new file mode 100644 index 0000000..adc67f1 --- /dev/null +++ b/src/main/java/derfl007/roads/models/signs/RoadSignModel.java @@ -0,0 +1,21 @@ +package derfl007.roads.models.signs; + +import java.util.function.Function; + +import derfl007.roads.models.BaseModel; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.model.IModelState; + +public class RoadSignModel extends BaseModel { + + @Override + public IBakedModel bake(IModelState state, VertexFormat format, + Function bakedTextureGetter) { + // TODO Auto-generated method stub + return new RoadSignBakedModel(format, bakedTextureGetter); + } + +} diff --git a/src/main/java/derfl007/roads/models/signs/TrafficLightsBakedModel.java b/src/main/java/derfl007/roads/models/signs/TrafficLightsBakedModel.java new file mode 100644 index 0000000..53e7843 --- /dev/null +++ b/src/main/java/derfl007/roads/models/signs/TrafficLightsBakedModel.java @@ -0,0 +1,118 @@ +package derfl007.roads.models.signs; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; + +import javax.annotation.Nullable; + +import com.google.common.collect.ImmutableMap; + +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.block.model.ModelRotation; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.common.model.IModelState; + +public class TrafficLightsBakedModel extends BaseSignBakedModel { + private static final TrafficLightsItemOverride itemOverride = new TrafficLightsItemOverride(); + + public static final String TEXTURE_GREEN_OFF = "df-roads:blocks/traffic_light_green_off"; + public static final String TEXTURE_YELLOW_OFF = "df-roads:blocks/traffic_light_yellow_off"; + public static final String TEXTURE_RED_OFF = "df-roads:blocks/traffic_light_red_off"; + + public static final String TEXTURE_GREEN_ON = "df-roads:blocks/traffic_light_green_on"; + public static final String TEXTURE_YELLOW_ON = "df-roads:blocks/traffic_light_yellow_on"; + public static final String TEXTURE_RED_ON = "df-roads:blocks/traffic_light_red_on"; + + public static final String TEXTURE_YELLOW_BLINKING = "df-roads:blocks/traffic_light_yellow_blinking"; + + TrafficLightsBakedModel(VertexFormat format, Function bakedTextureGetter) { + super(format, bakedTextureGetter); + } + + protected TrafficLightsBakedModel(TrafficLightsBakedModel parentModel) { + super(parentModel); + } + + @Nullable + @Override + protected IModel getModel(@Nullable IBlockState state) { + // TODO Auto-generated method stub + int modelIndex = TRAFFIC_LIGHTS_INDEX; + if (state != null) { + BlockRoadTrafficLightBase trafficLight = (BlockRoadTrafficLightBase) state.getBlock(); + if (trafficLight.isPedestrianLights()) { + modelIndex = PEDESTRIAN_TRAFFIC_LIGHTS_INDEX; + } + } + return getModel(modelIndex); + } + + @Nullable + @Override + protected IModelState getModelState(IModel model, @Nullable IBlockState state) { + // TODO Auto-generated method stub + + if (state == null) { + return ModelRotation.X0_Y0; + } + + final EnumFacing facing = state.getValue(BlockRoadTrafficLightBase.FACING); + + return getModelState(facing); + } + + @Override + protected IModel retexture(IModel model, BlockRoadTrafficLightBase trafficLight) { + + Map textures = new HashMap<>(); + + textures.put("1", TEXTURE_GREEN_OFF); + if (trafficLight.isPedestrianLights()) { + textures.put("2", TEXTURE_RED_OFF); + } else { + textures.put("2", TEXTURE_YELLOW_OFF); + textures.put("3", TEXTURE_RED_OFF); + } + + switch (trafficLight.getState()) { + case GREEN: + textures.put("1", TEXTURE_GREEN_ON); + break; + case YELLOW: + textures.put("2", TEXTURE_YELLOW_ON); + break; + case RED: + textures.put(trafficLight.isPedestrianLights() ? "2" : "3", TEXTURE_RED_ON); + break; + case DEACTIVATED: + if (!trafficLight.isPedestrianLights()) { + textures.put("2", TEXTURE_YELLOW_BLINKING); + } + } + + model = model.retexture(ImmutableMap.copyOf(textures)); + + return model; + } + + @Override + public TextureAtlasSprite getParticleTexture() { + // TODO Auto-generated method stub + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:blocks/coal_block"); + } + + @Override + public ItemOverrideList getOverrides() { + // TODO Auto-generated method stub + return itemOverride; + } + +} diff --git a/src/main/java/derfl007/roads/models/signs/TrafficLightsItemBakedModel.java b/src/main/java/derfl007/roads/models/signs/TrafficLightsItemBakedModel.java new file mode 100644 index 0000000..8e13078 --- /dev/null +++ b/src/main/java/derfl007/roads/models/signs/TrafficLightsItemBakedModel.java @@ -0,0 +1,42 @@ +package derfl007.roads.models.signs; + +import javax.annotation.Nullable; + +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraftforge.client.model.IModel; + +public class TrafficLightsItemBakedModel extends TrafficLightsBakedModel { + + private final BlockRoadTrafficLightBase block; + + TrafficLightsItemBakedModel(TrafficLightsBakedModel parentModel, BlockRoadTrafficLightBase block) { + super(parentModel); + + this.block = block; + } + + @Override + protected final IModel retexture(IModel model) { + return retexture(model, block); + } + + @Deprecated() + @Override + public ItemOverrideList getOverrides() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException(); + } + + @Nullable + @Override + protected IModel getModel(@Nullable IBlockState state) { + // TODO Auto-generated method stub + if(block.isPedestrianLights()) { + return getModel(PEDESTRIAN_TRAFFIC_LIGHTS_INDEX); + }else { + return getModel(TRAFFIC_LIGHTS_INDEX); + } + } +} diff --git a/src/main/java/derfl007/roads/models/signs/TrafficLightsItemOverride.java b/src/main/java/derfl007/roads/models/signs/TrafficLightsItemOverride.java new file mode 100644 index 0000000..7884c71 --- /dev/null +++ b/src/main/java/derfl007/roads/models/signs/TrafficLightsItemOverride.java @@ -0,0 +1,35 @@ +package derfl007.roads.models.signs; + +import java.util.ArrayList; + +import javax.annotation.Nullable; + +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemOverride; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class TrafficLightsItemOverride extends ItemOverrideList { + + public TrafficLightsItemOverride() { + super(new ArrayList()); + } + + + @Override + public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, @Nullable World world, + @Nullable EntityLivingBase entity) { + if (originalModel instanceof TrafficLightsBakedModel && !stack.isEmpty()) { + Block block = Block.getBlockFromItem(stack.getItem()); + if(block != null && block instanceof BlockRoadTrafficLightBase) { + return new TrafficLightsItemBakedModel((TrafficLightsBakedModel) originalModel, (BlockRoadTrafficLightBase) block); + } + } + return originalModel; + } + +} diff --git a/src/main/java/derfl007/roads/models/signs/TrafficLightsModel.java b/src/main/java/derfl007/roads/models/signs/TrafficLightsModel.java new file mode 100644 index 0000000..21af3a0 --- /dev/null +++ b/src/main/java/derfl007/roads/models/signs/TrafficLightsModel.java @@ -0,0 +1,21 @@ +package derfl007.roads.models.signs; + +import java.util.function.Function; + +import derfl007.roads.models.BaseModel; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.model.IModelState; + +public class TrafficLightsModel extends BaseModel { + + @Override + public IBakedModel bake(IModelState state, VertexFormat format, + Function bakedTextureGetter) { + // TODO Auto-generated method stub + return new TrafficLightsBakedModel(format, bakedTextureGetter); + } + +} diff --git a/src/main/java/derfl007/roads/proxy/ClientProxy.java b/src/main/java/derfl007/roads/proxy/ClientProxy.java index 7288118..9b65af3 100644 --- a/src/main/java/derfl007/roads/proxy/ClientProxy.java +++ b/src/main/java/derfl007/roads/proxy/ClientProxy.java @@ -4,19 +4,14 @@ import derfl007.roads.client.renderer.tileentity.TileEntityRoadTownSignRenderer; import derfl007.roads.common.tileentities.TileEntityRoadTownSign; import derfl007.roads.init.RoadBlocks; -import derfl007.roads.init.RoadCrafting; import derfl007.roads.init.RoadItems; -import derfl007.roads.world.WorldGenOre; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; -import java.awt.*; - public class ClientProxy implements CommonProxy { @Override diff --git a/src/main/java/derfl007/roads/proxy/ServerProxy.java b/src/main/java/derfl007/roads/proxy/ServerProxy.java index 136ee39..ee9aa77 100644 --- a/src/main/java/derfl007/roads/proxy/ServerProxy.java +++ b/src/main/java/derfl007/roads/proxy/ServerProxy.java @@ -1,8 +1,5 @@ package derfl007.roads.proxy; -import derfl007.roads.world.WorldGenOre; -import net.minecraftforge.fml.common.registry.GameRegistry; - public class ServerProxy implements CommonProxy { @Override public void preInit() { diff --git a/src/main/java/derfl007/roads/render/AxisAlignedRectangleSettings.java b/src/main/java/derfl007/roads/render/AxisAlignedRectangleSettings.java new file mode 100644 index 0000000..a78f99c --- /dev/null +++ b/src/main/java/derfl007/roads/render/AxisAlignedRectangleSettings.java @@ -0,0 +1,45 @@ +package derfl007.roads.render; + +import net.minecraft.util.EnumFacing; + +public class AxisAlignedRectangleSettings { + + public final double offset; + + public final double left; + public final double bottom; + public final double width; + public final double height; + + private AxisAlignedRectangleSettings(double offset, double left, double bottom, double width, double height) { + this.offset = offset; + this.left = left; + this.bottom = bottom; + this.width = width; + this.height = height; + } + + public AxisAlignedRectangleSettings() { + this(0D, 0D, 0D, 1D, 1D); + } + + public AxisAlignedRectangleSettings setOffset(double offset) { + return new AxisAlignedRectangleSettings(offset, left, bottom, width, height); + } + + public AxisAlignedRectangleSettings setLeft(double left) { + return new AxisAlignedRectangleSettings(offset, left, bottom, width, height); + } + + public AxisAlignedRectangleSettings setBottom(double bottom) { + return new AxisAlignedRectangleSettings(offset, left, bottom, width, height); + } + + public AxisAlignedRectangleSettings setWidth(double width) { + return new AxisAlignedRectangleSettings(offset, left, bottom, width, height); + } + + public AxisAlignedRectangleSettings setHeight(double height) { + return new AxisAlignedRectangleSettings(offset, left, bottom, width, height); + } +} diff --git a/src/main/java/derfl007/roads/render/Quad.java b/src/main/java/derfl007/roads/render/Quad.java new file mode 100644 index 0000000..7b692e0 --- /dev/null +++ b/src/main/java/derfl007/roads/render/Quad.java @@ -0,0 +1,188 @@ +package derfl007.roads.render; + +import java.awt.Color; + +import javax.vecmath.Matrix3d; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.math.Vec3d; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; + +public class Quad { + + private Vec3d vec1; + private Vec3d vec2; + private Vec3d vec3; + private Vec3d vec4; + + private double x1 = 0F; + private double x2 = 16F; + private double y1 = 0F; + private double y2 = 16F; + + private TextureAtlasSprite sprite; + + protected VertexFormat format; + + public Quad(Vec3d vec1, Vec3d vec2, Vec3d vec3, Vec3d vec4, TextureAtlasSprite sprite, VertexFormat format) { + this.vec1 = vec1; + this.vec2 = vec2; + this.vec3 = vec3; + this.vec4 = vec4; + + this.format = format; + + this.sprite = sprite; + + } + + // Adapted from mcjty's tutorial + // https://wiki.mcjty.eu/modding/index.php?title=Render_Block_Baked_Model-1.12 + public BakedQuad bake() { + Vec3d normal = vec3.subtract(vec2).crossProduct(vec1.subtract(vec2)).normalize(); + + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(format); + builder.setTexture(sprite); + + putVertex(builder, normal, vec1.x, vec1.y, vec1.z, x1, y1, sprite, 0); + putVertex(builder, normal, vec2.x, vec2.y, vec2.z, x1, y2, sprite, 0); + putVertex(builder, normal, vec3.x, vec3.y, vec3.z, x2, y2, sprite, 0); + putVertex(builder, normal, vec4.x, vec4.y, vec4.z, x2, y1, sprite, 0); + + return builder.build(); + } + + // Copied from mcjty's tutorial + // https://wiki.mcjty.eu/modding/index.php?title=Render_Block_Baked_Model-1.12 + protected void putVertex(UnpackedBakedQuad.Builder builder, Vec3d normal, double x, double y, double z, double u, + double v, TextureAtlasSprite sprite, int col) { + for (int e = 0; e < format.getElementCount(); e++) { + switch (format.getElement(e).getUsage()) { + case POSITION: + builder.put(e, (float) x, (float) y, (float) z, 1.0f); + break; + case COLOR: + if (col == 0) { + builder.put(e, 1.0f, 1.0f, 1.0f, 1.0f); + } else { + Color color = new Color(col); + builder.put(e, color.getRed() / 255.0f, color.getGreen() / 255.0f, color.getBlue() / 255.0f, + color.getAlpha() / 255.0f); + } + break; + case UV: + if (format.getElement(e).getIndex() == 0) { + u = sprite.getInterpolatedU(u); + v = sprite.getInterpolatedV(v); + builder.put(e, (float) u, (float) v, 0f, 1f); + break; + } + case NORMAL: + builder.put(e, (float) normal.x, (float) normal.y, (float) normal.z, 0f); + break; + default: + builder.put(e); + break; + } + } + } + + public void fillTexture() { + setUV(0, 0, 1, 1); + } + + public void setUV(double x1, double y1, double x2, double y2) { + this.x1 = 16f * x1; + this.y1 = 16f * y1; + this.x2 = 16f * x2; + this.y2 = 16f * y2; + } + + public void rotateY(int angleDeg) { + double angleRad = Math.toRadians(angleDeg); + double cos = Math.cos(angleRad); + double sin = Math.sin(angleRad); + + Matrix3d transformation = new Matrix3d(cos, 0D, sin, + 0D, 1D, 0D, + -sin, 0D, cos); + + applyCenteredTransformation(transformation); + } + + public void rotateX(int angleDeg) { + double angleRad = Math.toRadians(angleDeg); + double cos = Math.cos(angleRad); + double sin = Math.sin(angleRad); + + Matrix3d transformation = new Matrix3d(1D, 0D, 0D, + 0D, cos, -sin, + 0D, sin, cos); + + applyCenteredTransformation(transformation); + } + + public void rotateZ(int angleDeg) { + double angleRad = Math.toRadians(angleDeg); + double cos = Math.cos(angleRad); + double sin = Math.sin(angleRad); + + + Matrix3d transformation = new Matrix3d(cos, -sin, 0D, + sin, cos, 0D, + 0D, 0D, 1D); + + applyCenteredTransformation(transformation); + } + + public void scale(double factor) { + Matrix3d transformation = new Matrix3d(factor, 0D, 0D, + 0D, factor, 0D, + 0D, 0D, factor); + + applyCenteredTransformation(transformation); + } + + public void translate(double x, double y, double z) { + + vec1 = vec1.addVector(x,y,z); + vec2 = vec2.addVector(x,y,z); + vec3 = vec3.addVector(x,y,z); + vec4 = vec4.addVector(x,y,z); + } + + private void applyCenteredTransformation(Matrix3d transformation) { + vec1 = applyCenteredTransformation(vec1, transformation); + vec2 = applyCenteredTransformation(vec2, transformation); + vec3 = applyCenteredTransformation(vec3, transformation); + vec4 = applyCenteredTransformation(vec4, transformation); + } + + private Vec3d applyCenteredTransformation(Vec3d vector, Matrix3d transformation) { + return transform(vector.subtract(0.5, 0.5, 0.5), transformation).addVector(0.5, 0.5, 0.5); + } + + private Vec3d transform(Vec3d vector, Matrix3d transformation) { + double[] coords = new double[3]; + + for (int i = 0; i < 3; i++) { + coords[i] = transformation.getElement(i, 0) * vector.x + transformation.getElement(i, 1) * vector.y + + transformation.getElement(i, 2) * vector.z; + } + + return new Vec3d(coords[0], coords[1], coords[2]); + } + + public void rotateTexture90Clockwise() { + Vec3d vec = vec1; + vec1 = vec4; + vec4 = vec3; + vec3 = vec2; + vec2 = vec; + } + + + +} diff --git a/src/main/java/derfl007/roads/render/ShapeUtil.java b/src/main/java/derfl007/roads/render/ShapeUtil.java new file mode 100644 index 0000000..ba8f295 --- /dev/null +++ b/src/main/java/derfl007/roads/render/ShapeUtil.java @@ -0,0 +1,133 @@ +package derfl007.roads.render; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.Vec3d; + +public final class ShapeUtil { + + @Deprecated + private ShapeUtil() { + + } + + /** + * Creates an axis-aligned rectangle with the given settings. + * + * @param settings The settings of the rectangle. See overload for details. + * + * @param sprite The texture to be used with the quad. + * @param format The vertex format to be associated with the quad. + * @return + */ + public static Quad createAxisAlignedRectangle(EnumFacing face, AxisAlignedRectangleSettings settings, + TextureAtlasSprite sprite, VertexFormat format) { + return createAxisAlignedRectangle(face, settings.offset, settings.left, settings.bottom, settings.width, + settings.height, sprite, format); + } + + /** + * Creates an axis-aligned rectangle parallel to the specified face. + * + * @param face The face the rectangle will texture. + * @param offset The offset (toward the inside of the cube) in relation to the + * location of the outer corresponding face. + * @param left The horizontal offset from the left edge of the face, assuming + * the face is being looked at standing, from the outside of the + * cube. If the face is UP (resp. DOWN), it is assumed to be + * looked at lying, with the head facing north (resp. south). + * @param bottom The vertical offset from the *bottom* edge of the face, + * assuming the face is being looked at standing, from the outside + * of the cube. If the face is UP (resp. DOWN), it is assumed to + * be looked at lying, with the head facing north (resp. south). + * @param width The width of the rectangle. If the face is UP or DOWN, this is + * the size along X axis. + * @param height The height of the rectangle. If the face is UP or DOWN, this is + * the size along Z axis. + * @param sprite The texture to be used with the quad. + * @param format The vertex format to be associated with the quad. + * @return + */ + public static Quad createAxisAlignedRectangle(EnumFacing face, double offset, double left, double bottom, + double width, double height, TextureAtlasSprite sprite, VertexFormat format) { + Quad quad; + + switch (face) { + case SOUTH: + double zPos = 1 - offset; + + double xMin = left; + double xMax = left + width; + double yMin = bottom; + double yMax = bottom + height; + + quad = new Quad(new Vec3d(xMin, yMax, zPos), new Vec3d(xMin, yMin, zPos), new Vec3d(xMax, yMin, zPos), + new Vec3d(xMax, yMax, zPos), sprite, format); + break; + case WEST: + double xPos = offset; + + double zMin = left; + double zMax = left + width; + yMin = bottom; + yMax = bottom + height; + + quad = new Quad(new Vec3d(xPos, yMax, zMin), new Vec3d(xPos, yMin, zMin), new Vec3d(xPos, yMin, zMax), + new Vec3d(xPos, yMax, zMax), sprite, format); + break; + case NORTH: + zPos = offset; + + xMin = 1 - left; + xMax = 1 - left - width; + yMin = bottom; + yMax = bottom + height; + + quad = new Quad(new Vec3d(xMin, yMax, zPos), new Vec3d(xMin, yMin, zPos), new Vec3d(xMax, yMin, zPos), + new Vec3d(xMax, yMax, zPos), sprite, format); + break; + case EAST: + xPos = 1 - offset; + + zMin = 1 - left; + zMax = 1 - left - width; + yMin = bottom; + yMax = bottom + height; + + quad = new Quad(new Vec3d(xPos, yMax, zMin), new Vec3d(xPos, yMin, zMin), new Vec3d(xPos, yMin, zMax), + new Vec3d(xPos, yMax, zMax), sprite, format); + break; + case UP: + double yPos = 1 - offset; + + xMin = left; + xMax = left + width; + zMin = 1 - bottom; + zMax = 1 - bottom - height; + + quad = new Quad(new Vec3d(xMin, yPos, zMax), new Vec3d(xMin, yPos, zMin), new Vec3d(xMax, yPos, zMin), + new Vec3d(xMax, yPos, zMax), sprite, format); + break; + case DOWN: + yPos = offset; + + xMin = left; + xMax = left + width; + zMin = bottom; + zMax = bottom + height; + + quad = new Quad(new Vec3d(xMin, yPos, zMax), new Vec3d(xMin, yPos, zMin), new Vec3d(xMax, yPos, zMin), + new Vec3d(xMax, yPos, zMax), sprite, format); + break; + default: + throw new IllegalArgumentException(); + } + + quad.setUV(0, 0, width, height); + + return quad; + + } + +} diff --git a/src/main/java/derfl007/roads/trafficlights/LightsGroup.java b/src/main/java/derfl007/roads/trafficlights/LightsGroup.java index 17afa08..4bf18f2 100644 --- a/src/main/java/derfl007/roads/trafficlights/LightsGroup.java +++ b/src/main/java/derfl007/roads/trafficlights/LightsGroup.java @@ -7,12 +7,14 @@ import org.apache.commons.lang3.StringUtils; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; import net.minecraft.util.math.BlockPos; public class LightsGroup { - + private int greenDuration = -1; private int delay = -1; + private int yellowDuration = BlockRoadTrafficLightBase.DEFAULT_YELLOW_DURATION; private List lights; @@ -55,6 +57,14 @@ public int getDelay() { public void setDelay(int delay) { this.delay = delay; } + + public int getYellowDuration() { + return yellowDuration; + } + + public void setYellowDuration(int duration) { + this.yellowDuration = duration; + } @Override public boolean equals(Object other) { @@ -79,7 +89,7 @@ public String toString() { for (BlockPos pos : lights) { builder.add(String.format("(%d,%d,%d)", pos.getX(), pos.getY(), pos.getZ())); } - return String.format("[greenDuration=%d;delay=%d;pos=[%s]]", greenDuration, delay, + return String.format("[greenDuration=%d;yellowDuration=%d;delay=%d;pos=[%s]]", greenDuration, yellowDuration, delay, StringUtils.join(builder, "|")); } @@ -100,6 +110,8 @@ public static LightsGroup parseString(String value) throws IllegalArgumentExcept case "greenDuration": group.greenDuration = Integer.valueOf(details[1]); break; + case "yellowDuration": + group.yellowDuration = Integer.valueOf(details[1]); case "delay": group.delay = Integer.valueOf(details[1]); break; diff --git a/src/main/java/derfl007/roads/trafficlights/LightsSet.java b/src/main/java/derfl007/roads/trafficlights/LightsSet.java index 68888e0..89a4173 100644 --- a/src/main/java/derfl007/roads/trafficlights/LightsSet.java +++ b/src/main/java/derfl007/roads/trafficlights/LightsSet.java @@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils; import derfl007.roads.Roads; +import net.minecraft.world.World; @SuppressWarnings("serial") public class LightsSet extends ArrayList { @@ -15,8 +16,8 @@ public class LightsSet extends ArrayList { // private static final String DATA_NAME = Reference.MOD_ID + // "_TrafficLightsSets"; - public int currentGreenGroup = -1; - public long greenStartTime = -1; + private int currentGreenGroup = -1; + private long greenStartTime = -1; public static LightsSet parseString(String value) throws IllegalArgumentException { if (value == null || value.isEmpty()) { @@ -88,4 +89,37 @@ public String toString() { private static final String formatSpecifier = "^\\[[\\s\\S]*\\]$"; + public LightsGroup getCurrentGreenGroup() { + return get(currentGreenGroup); + } + + public long getGreenStartTime() { + return greenStartTime; + } + + + public void initialize(World world) { + currentGreenGroup = 0; + greenStartTime = world.getTotalWorldTime(); + } + + public void incrementGreenGroup(World world) { + currentGreenGroup++; + currentGreenGroup %= size(); + + greenStartTime = world.getTotalWorldTime(); + } + + void setGreenStartTime(long startTime) { + this.greenStartTime = startTime; + } + + boolean setCurrentGreenGroup(int group) { + if (group < 0) + return false; + + this.currentGreenGroup = group; + currentGreenGroup %= size(); + return true; + } } diff --git a/src/main/java/derfl007/roads/trafficlights/LightsSetList.java b/src/main/java/derfl007/roads/trafficlights/LightsSetList.java index 5c3a6d4..a221f25 100644 --- a/src/main/java/derfl007/roads/trafficlights/LightsSetList.java +++ b/src/main/java/derfl007/roads/trafficlights/LightsSetList.java @@ -50,12 +50,15 @@ public synchronized void addLightSet(String name, LightsSet value, boolean force if (!force && lightsSets.containsKey(name)) { return; } - if(force && !resetSyncState && lightsSets.containsKey(name)) { - value.currentGreenGroup = lightsSets.get(name).currentGreenGroup; - value.greenStartTime = lightsSets.get(name).greenStartTime; - }else { - value.currentGreenGroup = 0; - value.greenStartTime = 0; + if (force && !resetSyncState && lightsSets.containsKey(name)) { + + if (value.setCurrentGreenGroup(value.indexOf(lightsSets.get(name).getCurrentGreenGroup()))) { + value.setGreenStartTime(lightsSets.get(name).getGreenStartTime()); + } + + } else { + value.setCurrentGreenGroup(0); + value.setGreenStartTime(0); } lightsSets.put(name, value); this.markDirty(); @@ -144,7 +147,7 @@ public void readFromNBT(NBTTagCompound nbt) { if ((blockPos = findFirstDuplicatedLight()) != null) { lightsSets.clear(); Roads.logger.error(String.format( - "Found traffic lights linked to multiple groups, which is not authorized. Traffic lights sets cleared. First duplicate found at %s", + "Found traffic lights linked to multiple groups; this is not authorized. Traffic lights sets cleared. First duplicate found at %s", blockPos.toString())); return; } @@ -187,12 +190,8 @@ public boolean isDuplicated(BlockPos lightPos) { public boolean lightAlreadyUsed(BlockPos pos) { for (LightsSet set : lightsSets.values()) { - for (LightsGroup group : set) { - for (BlockPos blockPos : group.getLights()) { - if (blockPos.equals(pos)) { - return true; - } - } + if (lightAlreadyUsed(set, pos)) { + return true; } } return false; diff --git a/src/main/java/derfl007/roads/trafficlights/PropertyMode.java b/src/main/java/derfl007/roads/trafficlights/PropertyMode.java index 0d4e628..f5c8c29 100644 --- a/src/main/java/derfl007/roads/trafficlights/PropertyMode.java +++ b/src/main/java/derfl007/roads/trafficlights/PropertyMode.java @@ -5,30 +5,30 @@ import com.google.common.base.Optional; -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen; -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen.Mode; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase.TrafficLightsControlMode; import net.minecraft.block.properties.PropertyHelper; -public class PropertyMode extends PropertyHelper { +public class PropertyMode extends PropertyHelper { public PropertyMode(String name) { - super(name, Mode.class); + super(name, TrafficLightsControlMode.class); // TODO Auto-generated constructor stub } @Override - public Collection getAllowedValues() { + public Collection getAllowedValues() { // TODO Auto-generated method stub - Mode[] modes = BlockRoadTrafficLightGen.Mode.values(); + TrafficLightsControlMode[] modes = BlockRoadTrafficLightBase.TrafficLightsControlMode.values(); return Arrays.asList(modes); } @Override - public Optional parseValue(String value) { + public Optional parseValue(String value) { // TODO Auto-generated method stub - Mode mode; + TrafficLightsControlMode mode; try { - mode = Mode.valueOf(value); + mode = TrafficLightsControlMode.valueOf(value); }catch(IllegalArgumentException ex) { return Optional.absent(); } @@ -39,7 +39,7 @@ public Optional parseValue(String value) { } @Override - public String getName(Mode value) { + public String getName(TrafficLightsControlMode value) { // TODO Auto-generated method stub return value.name(); } diff --git a/src/main/java/derfl007/roads/trafficlights/ServerTickHandler.java b/src/main/java/derfl007/roads/trafficlights/ServerTickHandler.java index 2896168..ccd57aa 100644 --- a/src/main/java/derfl007/roads/trafficlights/ServerTickHandler.java +++ b/src/main/java/derfl007/roads/trafficlights/ServerTickHandler.java @@ -1,9 +1,9 @@ package derfl007.roads.trafficlights; -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen; -import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightGen.Mode; -import derfl007.roads.common.blocks.trafficlights.pedestriantrafficlights.BlockRoadPedestrianTrafficLightGen; -import derfl007.roads.init.RoadBlocks; +import derfl007.roads.Reference; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase.LightsState; +import derfl007.roads.common.blocks.trafficlights.BlockRoadTrafficLightBase.TrafficLightsControlMode; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -15,142 +15,98 @@ public class ServerTickHandler { - public static final int TICK_RATE = 20; private int tickCount = 0; - private BlockRoadTrafficLightGen getTrafficLight(World world, BlockPos pos) { - if (world.getBlockState(pos).getBlock() instanceof BlockRoadTrafficLightGen) { + private BlockRoadTrafficLightBase getTrafficLight(World world, BlockPos pos) { + if (world.getBlockState(pos).getBlock() instanceof BlockRoadTrafficLightBase) { - BlockRoadTrafficLightGen block = (BlockRoadTrafficLightGen) world.getBlockState(pos).getBlock(); - if (block.getMode(world.getBlockState(pos)) == Mode.command_controlled) { + BlockRoadTrafficLightBase block = (BlockRoadTrafficLightBase) world.getBlockState(pos).getBlock(); + if (block.getMode(world.getBlockState(pos)) == TrafficLightsControlMode.command_controlled) { return block; - } /* - * else { Roads.logger.warn("Traffic light at " + pos.toString() + - * " is set to an illegal mode and was ignored."); } - */ // was spamming - } /* - * else { Roads.logger.warn("Traffic light at " + pos.toString() + - * " no longer exists and was ignored."); } - */ // was spamming + } + } return null; } - @SubscribeEvent - public synchronized void onServerTick(ServerTickEvent event) { - if (event.phase != Phase.END || event.side != Side.SERVER || ++tickCount % 2 != 0) - return; - - MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); - - for (World world : server.worlds) { - LightsSetList sets = LightsSetList.get(world); - - for (LightsSet set : sets.getLightSets()) { - - for (int i = 0; i < set.size(); i++) { - if (i == set.currentGreenGroup) { - - if (set.greenStartTime == 0) // not initialised yet. - set.greenStartTime = world.getTotalWorldTime(); + private synchronized boolean shouldIncrementCurrentGroup(World world, long greenStartTime, LightsGroup group) { + return world.getTotalWorldTime() + - greenStartTime >= (group.getGreenDuration() + group.getYellowDuration() + group.getDelay()) + * Reference.TICK_RATE; - if (world.getTotalWorldTime() - - set.greenStartTime >= (set.get(set.currentGreenGroup).getGreenDuration() - + set.get(set.currentGreenGroup).getDelay()) * TICK_RATE - + BlockRoadTrafficLightGen.YELLOW_DURATION) { - - for (BlockPos pos : set.get(i).getLights()) { - BlockRoadTrafficLightGen block = getTrafficLight(world, pos); - if (block == null) - continue; + } - turnRed(world, pos, block); - } + private synchronized LightsState expectedLightsState(World world, long greenStartTime, LightsGroup group) { + long elapsed = world.getTotalWorldTime() - greenStartTime; - set.currentGreenGroup++; - set.currentGreenGroup = set.currentGreenGroup % set.size(); - set.greenStartTime = world.getTotalWorldTime(); - sets.markDirty(); - onServerTick(event); // REFRESHING ALL as cycle changed - return; + if (elapsed >= group.getGreenDuration() * Reference.TICK_RATE) { - } else if (world.getTotalWorldTime() - - set.greenStartTime >= set.get(set.currentGreenGroup).getGreenDuration() * TICK_RATE - + BlockRoadTrafficLightGen.YELLOW_DURATION) { + if (elapsed >= (group.getGreenDuration() + group.getYellowDuration()) * Reference.TICK_RATE) { - for (BlockPos pos : set.get(i).getLights()) { + return LightsState.RED; - BlockRoadTrafficLightGen block = getTrafficLight(world, pos); - if (block == null) - continue; + } - turnRed(world, pos, block); + return LightsState.YELLOW; + } - } + return LightsState.GREEN; + } - } else if (world.getTotalWorldTime() - - set.greenStartTime >= set.get(set.currentGreenGroup).getGreenDuration() * TICK_RATE) { + private synchronized void updateLightsSet(World world, LightsSet set) { + if (set.getGreenStartTime() == 0) + set.initialize(world); - for (BlockPos pos : set.get(i).getLights()) { + if (shouldIncrementCurrentGroup(world, set.getGreenStartTime(), set.getCurrentGreenGroup())) { + set.incrementGreenGroup(world); + } - BlockRoadTrafficLightGen block = getTrafficLight(world, pos); - if (block == null) - continue; + for (int i = 0; i < set.size(); i++) { - turnYellow(world, pos, block); + LightsGroup group = set.get(i); - } + if (group == set.getCurrentGreenGroup()) { - } else { + LightsState enforcedState = expectedLightsState(world, set.getGreenStartTime(), group); - for (BlockPos pos : set.get(i).getLights()) { + for (BlockPos pos : group.getLights()) { + BlockRoadTrafficLightBase block = getTrafficLight(world, pos); + if (block == null) + continue; - BlockRoadTrafficLightGen block = getTrafficLight(world, pos); - if (block == null) - continue; + block.setLightsState(world, pos, enforcedState); - turnGreen(world, pos, block); + } - } - } - } else { - for (BlockPos pos : set.get(i).getLights()) { + } else { + for (BlockPos pos : set.get(i).getLights()) { - BlockRoadTrafficLightGen block = getTrafficLight(world, pos); - if (block == null) - continue; + BlockRoadTrafficLightBase block = getTrafficLight(world, pos); + if (block == null) + continue; - turnRed(world, pos, block); + block.setLightsState(world, pos, LightsState.RED); - } - } } - } } } - private void turnYellow(World world, BlockPos pos, BlockRoadTrafficLightGen block) { - if (world.getBlockState(pos).getBlock() instanceof BlockRoadPedestrianTrafficLightGen) { - block.setBlockState(world, pos, world.getBlockState(pos), RoadBlocks.road_pedestrian_traffic_light_red); - } else { - block.setBlockState(world, pos, world.getBlockState(pos), RoadBlocks.road_traffic_light_yellow_dyn); - } - } + @SubscribeEvent + public synchronized void onServerTick(ServerTickEvent event) { + if (event.phase != Phase.END || event.side != Side.SERVER || ++tickCount % 2 != 0) + return; - private void turnRed(World world, BlockPos pos, BlockRoadTrafficLightGen block) { - if (world.getBlockState(pos).getBlock() instanceof BlockRoadPedestrianTrafficLightGen) { - block.setBlockState(world, pos, world.getBlockState(pos), RoadBlocks.road_pedestrian_traffic_light_red); - } else { - block.setBlockState(world, pos, world.getBlockState(pos), RoadBlocks.road_traffic_light_red_dyn); - } - } + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); + + for (World world : server.worlds) { + LightsSetList sets = LightsSetList.get(world); + + for (LightsSet set : sets.getLightSets()) { + + updateLightsSet(world, set); + } - private void turnGreen(World world, BlockPos pos, BlockRoadTrafficLightGen block) { - if (world.getBlockState(pos).getBlock() instanceof BlockRoadPedestrianTrafficLightGen) { - block.setBlockState(world, pos, world.getBlockState(pos), RoadBlocks.road_pedestrian_traffic_light_green); - } else { - block.setBlockState(world, pos, world.getBlockState(pos), RoadBlocks.road_traffic_light_green_dyn); } } diff --git a/src/main/java/derfl007/roads/trafficlights/YellowLightsStartTimes.java b/src/main/java/derfl007/roads/trafficlights/YellowLightsStartTimes.java index b99d853..765f374 100644 --- a/src/main/java/derfl007/roads/trafficlights/YellowLightsStartTimes.java +++ b/src/main/java/derfl007/roads/trafficlights/YellowLightsStartTimes.java @@ -39,8 +39,7 @@ public Map getAddedTimes() { public Long getAddedTime(World worldIn, BlockPos pos) { if (!addedTimes.containsKey(pos)) { - addedTimes.put(pos, worldIn.getTotalWorldTime()); - markDirty(); + updateAddedTime(worldIn, pos); } return addedTimes.get(pos); } @@ -49,6 +48,11 @@ public void updateAddedTime(World worldIn, BlockPos pos) { addedTimes.put(pos, worldIn.getTotalWorldTime()); markDirty(); } + + public void removeAddedTime(BlockPos pos) { + addedTimes.remove(pos); + markDirty(); + } @Override public String toString() { diff --git a/src/main/java/derfl007/roads/world/WorldGenOre.java b/src/main/java/derfl007/roads/world/WorldGenOre.java index 2e04ffa..d562b49 100644 --- a/src/main/java/derfl007/roads/world/WorldGenOre.java +++ b/src/main/java/derfl007/roads/world/WorldGenOre.java @@ -1,6 +1,9 @@ package derfl007.roads.world; +import java.util.Random; + import com.google.common.base.Predicate; + import derfl007.roads.init.RoadBlocks; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockMatcher; @@ -12,8 +15,6 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraftforge.fml.common.IWorldGenerator; -import java.util.Random; - public class WorldGenOre implements IWorldGenerator { @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) { diff --git a/src/main/resources/assets/df-roads/blockstates/road.json b/src/main/resources/assets/df-roads/blockstates/road.json deleted file mode 100644 index e50c56f..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "df-roads:road" - }, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_l.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_l.json deleted file mode 100644 index 1208821..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_l.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_l_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_l_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_l_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_l_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_l_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_l_yellow.json deleted file mode 100644 index 806b3c4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_l_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_l_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_l_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_l_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_l_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_r.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_r.json deleted file mode 100644 index b2c6473..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_r.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_r_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_r_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_r_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_r_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_r_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_r_yellow.json deleted file mode 100644 index a5e2c4e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_r_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_r_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_r_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_r_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_r_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_rl.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_rl.json deleted file mode 100644 index b80c94b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_rl.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_rl_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_rl_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_rl_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_rl_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_rl_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_rl_yellow.json deleted file mode 100644 index ee895a4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_rl_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_rl_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_rl_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_rl_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_rl_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_s.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_s.json deleted file mode 100644 index 5b9cd62..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_s.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_s_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_s_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_s_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_s_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_s_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_s_yellow.json deleted file mode 100644 index 383ce17..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_s_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_s_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_s_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_s_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_s_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_sl.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_sl.json deleted file mode 100644 index 221257e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_sl.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_sl_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_sl_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_sl_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_sl_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_sl_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_sl_yellow.json deleted file mode 100644 index 11a7ab8..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_sl_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_sl_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_sl_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_sl_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_sl_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_sr.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_sr.json deleted file mode 100644 index f731ea6..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_sr.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_sr_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_sr_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_sr_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_sr_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_sr_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_sr_yellow.json deleted file mode 100644 index ade7ab5..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_sr_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_sr_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_sr_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_sr_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_sr_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_srl.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_srl.json deleted file mode 100644 index 9b03600..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_srl.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_srl_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_srl_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_srl_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_srl_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_arrow_srl_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_arrow_srl_yellow.json deleted file mode 100644 index 7a590eb..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_arrow_srl_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_arrow_srl_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_arrow_srl_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_arrow_srl_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_arrow_srl_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_crosswalk.json b/src/main/resources/assets/df-roads/blockstates/road_crosswalk.json deleted file mode 100644 index d536938..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_crosswalk.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_crosswalk_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_crosswalk_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_crosswalk_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_crosswalk_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_crosswalk_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_crosswalk_yellow.json deleted file mode 100644 index fecd349..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_crosswalk_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_crosswalk_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_crosswalk_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_crosswalk_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_crosswalk_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone.json deleted file mode 100644 index 9b313ff..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "top": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "top": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "top": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "top": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - - }, - "east": { - - }, - "south": { - - }, - "west": { - - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_in.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_in.json deleted file mode 100644 index df88e90..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_in.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_in_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_in_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_in_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_in_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_in_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_in_yellow.json deleted file mode 100644 index ae8d799..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_in_yellow.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_in_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_in_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_in_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_in_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_out.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_out.json deleted file mode 100644 index 6652e6f..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_out.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_out_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_out_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_out_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_out_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_out_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_out_yellow.json deleted file mode 100644 index aa6f8d6..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_corner_out_yellow.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_out_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_out_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_out_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_out_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_in.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_in.json deleted file mode 100644 index e4efd3d..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_in.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_in_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_in_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_in_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_in_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_in_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_in_yellow.json deleted file mode 100644 index 53a5e3c..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_in_yellow.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_in_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_in_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_in_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_in_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_out.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_out.json deleted file mode 100644 index 59df1f2..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_out.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_out_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_out_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_out_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_out_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_out_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_out_yellow.json deleted file mode 100644 index a507eed..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_diagonal_out_yellow.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_out_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_out_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_out_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_out_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_line.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_line.json deleted file mode 100644 index 84bc964..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_line.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_line_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_line_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_line_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_line_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_line_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_line_yellow.json deleted file mode 100644 index 7d65faf..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_line_yellow.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_line_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_line_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_line_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_line_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_l.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_l.json deleted file mode 100644 index 7014599..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_l.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_l_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_l_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_l_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_l_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_l_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_l_yellow.json deleted file mode 100644 index b1f0cc4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_l_yellow.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_l_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_l_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_l_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_l_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_r.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_r.json deleted file mode 100644 index 02dbf75..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_r.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_r_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_r_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_r_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_r_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_r_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_r_yellow.json deleted file mode 100644 index 837a652..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_in_r_yellow.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_r_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_r_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_r_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_r_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_l.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_l.json deleted file mode 100644 index 1343b8a..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_l.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_l_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_l_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_l_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_l_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_l_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_l_yellow.json deleted file mode 100644 index da4b474..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_l_yellow.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_l_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_l_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_l_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_l_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_r.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_r.json deleted file mode 100644 index 810f09b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_r.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_r_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_r_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_r_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_r_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_r_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_r_yellow.json deleted file mode 100644 index 2e284ba..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_split_out_r_yellow.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_excl_zone_slope" - }, - "false": { - "model": "df-roads:road_excl_zone" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "excl": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_r_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_r_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_r_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_r_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_excl_zone_yellow.json deleted file mode 100644 index 867dc00..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_excl_zone_yellow.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180, - "textures": { - "top": "df-roads:blocks/road_excl_zone_north_yellow" - } - }, - "south": { - "y": 0, - "textures": { - "top": "df-roads:blocks/road_excl_zone_south_yellow" - } - }, - "east": { - "y": 270, - "textures": { - "top": "df-roads:blocks/road_excl_zone_east_yellow" - } - }, - "west": { - "y": 90, - "textures": { - "top": "df-roads:blocks/road_excl_zone_west_yellow" - } - } - }, - "slope_facing": { - "north": { - - }, - "east": { - - }, - "south": { - - }, - "west": { - - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_junction_marker.json b/src/main/resources/assets/df-roads/blockstates/road_junction_marker.json new file mode 100644 index 0000000..ae7f4e0 --- /dev/null +++ b/src/main/resources/assets/df-roads/blockstates/road_junction_marker.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": { + "model": "df-roads:road_junction_marker" + }, + "inventory": { + "model": "df-roads:road_junction_marker" + } + } +} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line.json b/src/main/resources/assets/df-roads/blockstates/road_line.json deleted file mode 100644 index a966477..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "df-roads:road_line_base" } - }, - { "when": { "north": "true" }, - "apply": { "model": "df-roads:road_line_north_white" } - }, - { "when": { "north": "false" }, - "apply": { "model": "df-roads:road_line_north" } - }, - { "when": { "south": "true" }, - "apply": { "model": "df-roads:road_line_south_white" } - }, - { "when": { "south": "false" }, - "apply": { "model": "df-roads:road_line_south" } - }, - { "when": { "east": "true" }, - "apply": { "model": "df-roads:road_line_east_white" } - }, - { "when": { "east": "false" }, - "apply": { "model": "df-roads:road_line_east" } - }, - { "when": { "west": "true" }, - "apply": { "model": "df-roads:road_line_west_white" } - }, - { "when": { "west": "false" }, - "apply": { "model": "df-roads:road_line_west" } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_diagonal.json b/src/main/resources/assets/df-roads/blockstates/road_line_diagonal.json deleted file mode 100644 index 5e05b73..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_diagonal.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_diagonal_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_diagonal_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_diagonal_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_diagonal_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_diagonal_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_line_diagonal_yellow.json deleted file mode 100644 index 9491363..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_diagonal_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_diagonal_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_diagonal_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_diagonal_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_diagonal_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_double.json b/src/main/resources/assets/df-roads/blockstates/road_line_double.json deleted file mode 100644 index 4ca46d2..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_double.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "df-roads:road" - }, - "variants": { - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "shape": { - "straight": { - "textures": { - "top": "df-roads:blocks/road_line_double" - } - }, - "inner_right": { - "textures": { - "top": "df-roads:blocks/road_line_double_inner_right_corner" - }, - "y": 0 - }, - "inner_left": { - "textures": { - "top": "df-roads:blocks/road_line_double_inner_left_corner" - }, - "y": 0 - }, - "outer_right": { - "textures": { - "top": "df-roads:blocks/road_line_double_outer_right_corner" - }, - "y": 0 - }, - "outer_left": { - "textures": { - "top": "df-roads:blocks/road_line_double_outer_left_corner" - }, - "y": 270 - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_double_simple.json b/src/main/resources/assets/df-roads/blockstates/road_line_double_simple.json deleted file mode 100644 index 8cb9ea3..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_double_simple.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_double" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_double_h" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_double" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_double_h" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_double_simple_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_line_double_simple_yellow.json deleted file mode 100644 index fe06bd2..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_double_simple_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_double_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_double_h_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_double_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_double_h_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_double_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_line_double_yellow.json deleted file mode 100644 index 45d267b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_double_yellow.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "df-roads:road" - }, - "variants": { - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "shape": { - "straight": { - "textures": { - "top": "df-roads:blocks/road_line_double_yellow" - } - }, - "inner_right": { - "textures": { - "top": "df-roads:blocks/road_line_double_inner_right_corner_yellow" - }, - "y": 0 - }, - "inner_left": { - "textures": { - "top": "df-roads:blocks/road_line_double_inner_left_corner_yellow" - }, - "y": 0 - }, - "outer_right": { - "textures": { - "top": "df-roads:blocks/road_line_double_outer_right_corner_yellow" - }, - "y": 0 - }, - "outer_left": { - "textures": { - "top": "df-roads:blocks/road_line_double_outer_left_corner_yellow" - }, - "y": 270 - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_half_double.json b/src/main/resources/assets/df-roads/blockstates/road_line_half_double.json deleted file mode 100644 index 53d9055..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_half_double.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "df-roads:road" - }, - "variants": { - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "shape": { - "straight": { - "textures": { - "top": "df-roads:blocks/road_line_half_double" - } - }, - "inner_right": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_inner_right_corner" - }, - "y": 0 - }, - "inner_left": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_inner_left_corner" - }, - "y": 90 - }, - "outer_right": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_outer_right_corner" - }, - "y": 0 - }, - "outer_left": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_outer_left_corner" - }, - "y": 90 - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_half_double_simple.json b/src/main/resources/assets/df-roads/blockstates/road_line_half_double_simple.json deleted file mode 100644 index e2d9b7e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_half_double_simple.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_half_double_simple_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_line_half_double_simple_yellow.json deleted file mode 100644 index dd3d325..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_half_double_simple_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_half_double_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_line_half_double_yellow.json deleted file mode 100644 index 07087b1..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_half_double_yellow.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "df-roads:road" - }, - "variants": { - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "shape": { - "straight": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_yellow" - } - }, - "inner_right": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_inner_right_corner_yellow" - }, - "y": 0 - }, - "inner_left": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_inner_left_corner_yellow" - }, - "y": 90 - }, - "outer_right": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_outer_right_corner_yellow" - }, - "y": 0 - }, - "outer_left": { - "textures": { - "top": "df-roads:blocks/road_line_half_double_outer_left_corner_yellow" - }, - "y": 90 - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_merge.json b/src/main/resources/assets/df-roads/blockstates/road_line_merge.json deleted file mode 100644 index 50fb0c3..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_merge.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_merge_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_merge_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_merge_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_merge_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_merge_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_line_merge_yellow.json deleted file mode 100644 index b2f3ac0..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_merge_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_merge_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_merge_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_merge_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_merge_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_simple.json b/src/main/resources/assets/df-roads/blockstates/road_line_simple.json deleted file mode 100644 index 551476d..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_simple.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_single" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_single_h" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_single" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_single_h" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_simple_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_line_simple_yellow.json deleted file mode 100644 index 7cd2e82..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_simple_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_single_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_single_h_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_single_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_single_h_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_split.json b/src/main/resources/assets/df-roads/blockstates/road_line_split.json deleted file mode 100644 index 43ec029..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_split.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_split_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_split_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_split_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_split_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_split_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_line_split_yellow.json deleted file mode 100644 index cdb652d..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_split_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_line_split_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_line_split_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_line_split_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_line_split_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_stop.json b/src/main/resources/assets/df-roads/blockstates/road_line_stop.json deleted file mode 100644 index 9425539..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_stop.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=north,east=true,west=true,north=false,south=false": { "model": "df-roads:road_line_stop_1" }, - "facing=north,east=true,west=false,north=false,south=false": { "model": "df-roads:road_line_stop_2" }, - "facing=north,east=false,west=true,north=false,south=false": { "model": "df-roads:road_line_stop_3" }, - "facing=north,east=false,west=false,north=false,south=false": { "model": "df-roads:road_line_stop_4" }, - "facing=south,east=true,west=true,north=false,south=false": { "model": "df-roads:road_line_stop_1", "y": 180 }, - "facing=south,east=true,west=false,north=false,south=false": { "model": "df-roads:road_line_stop_2", "y": 180 }, - "facing=south,east=false,west=true,north=false,south=false": { "model": "df-roads:road_line_stop_3", "y": 180 }, - "facing=south,east=false,west=false,north=false,south=false": { "model": "df-roads:road_line_stop_4", "y": 180 }, - "facing=east,north=true,south=true,east=false,west=false": { "model": "df-roads:road_line_stop_1", "y": 90 }, - "facing=east,north=true,south=false,east=false,west=false": { "model": "df-roads:road_line_stop_2", "y": 90 }, - "facing=east,north=false,south=true,east=false,west=false": { "model": "df-roads:road_line_stop_3", "y": 90 }, - "facing=east,north=false,south=false,east=false,west=false": { "model": "df-roads:road_line_stop_4", "y": 90 }, - "facing=west,north=true,south=true,east=false,west=false": { "model": "df-roads:road_line_stop_1", "y": 270 }, - "facing=west,north=true,south=false,east=false,west=false": { "model": "df-roads:road_line_stop_2", "y": 270 }, - "facing=west,north=false,south=true,east=false,west=false": { "model": "df-roads:road_line_stop_3", "y": 270 }, - "facing=west,north=false,south=false,east=false,west=false": { "model": "df-roads:road_line_stop_4", "y": 270 } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_line_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_line_yellow.json deleted file mode 100644 index 213ca73..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_line_yellow.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "df-roads:road_line_base_yellow" } - }, - { "when": { "north": "true" }, - "apply": { "model": "df-roads:road_line_north_yellow" } - }, - { "when": { "north": "false" }, - "apply": { "model": "df-roads:road_line_north" } - }, - { "when": { "south": "true" }, - "apply": { "model": "df-roads:road_line_south_yellow" } - }, - { "when": { "south": "false" }, - "apply": { "model": "df-roads:road_line_south" } - }, - { "when": { "east": "true" }, - "apply": { "model": "df-roads:road_line_east_yellow" } - }, - { "when": { "east": "false" }, - "apply": { "model": "df-roads:road_line_east" } - }, - { "when": { "west": "true" }, - "apply": { "model": "df-roads:road_line_west_yellow" } - }, - { "when": { "west": "false" }, - "apply": { "model": "df-roads:road_line_west" } - } - ] -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light.json b/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_auto.json similarity index 91% rename from src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light.json rename to src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_auto.json index 9cfdce8..1a544f7 100644 --- a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light.json +++ b/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_auto.json @@ -101,6 +101,40 @@ "model": "df-roads:road_pedestrian_traffic_light_1", "uvlock": true } - ] + ], + "power": { + "0": { + }, + "1": { + }, + "2": { + }, + "3": { + }, + "4": { + }, + "5": { + }, + "6": { + }, + "7": { + }, + "8": { + }, + "9": { + }, + "10": { + }, + "11": { + }, + "12": { + }, + "13": { + }, + "14": { + }, + "15": { + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_green.json b/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_green.json deleted file mode 100644 index f9faa22..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_green.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "powered": {"true": {}, "false": {} }, - "control_mode": {"redstone_controlled":{}, "command_controlled": {}, "deactivated": {}}, - "facing": { - "south": { - "model": "df-roads:road_pedestrian_traffic_light_green", - "uvlock": false - }, - "west": { - "model": "df-roads:road_pedestrian_traffic_light_green", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_pedestrian_traffic_light_green", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_pedestrian_traffic_light_green", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "model": "df-roads:road_pedestrian_traffic_light_green", - "uvlock": true - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_manual.json b/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_manual.json deleted file mode 100644 index 9cfdce8..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_manual.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "facing": { - "south": { - "model": "df-roads:road_pedestrian_traffic_light_2", - "uvlock": false - }, - "west": { - "model": "df-roads:road_pedestrian_traffic_light_1", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_pedestrian_traffic_light_2", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_pedestrian_traffic_light_1", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "model": "df-roads:road_pedestrian_traffic_light_1", - "uvlock": true - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_off.json b/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_off.json deleted file mode 100644 index 9f14e1e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_off.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "powered": {"true": {}, "false": {} }, - "control_mode": {"redstone_controlled":{}, "command_controlled": {}, "deactivated": {}}, - "facing": { - "south": { - "model": "df-roads:road_pedestrian_traffic_light_off", - "uvlock": false - }, - "west": { - "model": "df-roads:road_pedestrian_traffic_light_off", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_pedestrian_traffic_light_off", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_pedestrian_traffic_light_off", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "model": "df-roads:road_pedestrian_traffic_light_off", - "uvlock": true - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_red.json b/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_red.json deleted file mode 100644 index e927922..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_pedestrian_traffic_light_red.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "powered": {"true": {}, "false": {} }, - "control_mode": {"redstone_controlled":{}, "command_controlled": {}, "deactivated": {}}, - "facing": { - "south": { - "model": "df-roads:road_pedestrian_traffic_light_red", - "uvlock": false - }, - "west": { - "model": "df-roads:road_pedestrian_traffic_light_red", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_pedestrian_traffic_light_red", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_pedestrian_traffic_light_red", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "model": "df-roads:road_pedestrian_traffic_light_off", - "uvlock": true - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_roadsign.json b/src/main/resources/assets/df-roads/blockstates/road_roadsign.json deleted file mode 100644 index caf839a..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_roadsign.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "df-roads:road_roadblock_sign" , "y": 270}, - "facing=west": { "model": "df-roads:road_roadblock_sign", "y": 90 }, - "facing=south": { "model": "df-roads:road_roadblock_sign", "y": 0 }, - "facing=north": { "model": "df-roads:road_roadblock_sign", "y": 180 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_10a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_10a.json deleted file mode 100644 index 24076c8..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_10a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_10a", - "back": "df-roads:blocks/road_sign_info_10_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_10b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_10b.json deleted file mode 100644 index c89c4d3..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_10b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_10b", - "back": "df-roads:blocks/road_sign_info_10_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_10c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_10c.json deleted file mode 100644 index 3d95356..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_10c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_10c", - "back": "df-roads:blocks/road_sign_info_10_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_10d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_10d.json deleted file mode 100644 index 8adb06a..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_10d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_10d", - "back": "df-roads:blocks/road_sign_info_10_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_11.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_11.json deleted file mode 100644 index 6b68fb6..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_11.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_11", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_16a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_16a.json deleted file mode 100644 index f34cb96..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_16a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_16a", - "back": "df-roads:blocks/road_sign_info_16a_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_16b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_16b.json deleted file mode 100644 index 1cd953f..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_16b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_16b", - "back": "df-roads:blocks/road_sign_info_16b_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_16c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_16c.json deleted file mode 100644 index f88335e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_16c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_16c", - "back": "df-roads:blocks/road_sign_info_16a_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_16d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_16d.json deleted file mode 100644 index d09d9bf..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_16d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_16d", - "back": "df-roads:blocks/road_sign_info_16b_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_17a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_17a.json deleted file mode 100644 index 2024828..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_17a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_17a", - "back": "df-roads:blocks/road_town_sign_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_17b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_17b.json deleted file mode 100644 index f47801c..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_17b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_17b", - "back": "df-roads:blocks/road_town_sign_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_1a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_1a.json deleted file mode 100644 index 6a1d760..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_1a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_1a", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_1b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_1b.json deleted file mode 100644 index 6776475..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_1b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_1b", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_2.json deleted file mode 100644 index 512c007..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_2", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_23.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_23.json deleted file mode 100644 index f93d814..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_23.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_23", - "back": "df-roads:blocks/road_sign_info_23_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_23b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_23b.json deleted file mode 100644 index 0f8f842..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_23b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_23b", - "back": "df-roads:blocks/road_sign_info_23_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_2a.json deleted file mode 100644 index 8eaaf88..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_2a", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_2b.json deleted file mode 100644 index 419334a..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_2b", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2c_a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_2c_a.json deleted file mode 100644 index 5750471..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2c_a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_2c_a", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2c_b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_2c_b.json deleted file mode 100644 index e9759bb..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_2c_b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_2c_b", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_3.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_3.json deleted file mode 100644 index bb37fa4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_3.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_3", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_3a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_3a.json deleted file mode 100644 index 87fee31..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_3a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_3a", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_4.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_4.json deleted file mode 100644 index f286909..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_4.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_4", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_5.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_5.json deleted file mode 100644 index e16d9a0..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_5.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_5", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_6a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_6a.json deleted file mode 100644 index 65c6bc5..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_6a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_6a", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_7a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_7a.json deleted file mode 100644 index 7d7026d..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_7a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_7a", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_8a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_8a.json deleted file mode 100644 index 0f341c8..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_8a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_8a", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_8b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_8b.json deleted file mode 100644 index 12592a8..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_8b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_8b", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_8c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_8c.json deleted file mode 100644 index 6e39927..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_8c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_8c", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_8d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_8d.json deleted file mode 100644 index ab14206..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_8d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_8d", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_9a.json deleted file mode 100644 index 27fc258..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_9a", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_9b.json deleted file mode 100644 index c8f6b07..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_9b", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_9c.json deleted file mode 100644 index bc08eb1..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_9c", - "back": "df-roads:blocks/road_sign_back_rect_2" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_9d.json deleted file mode 100644 index 5b18e3c..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_9d", - "back": "df-roads:blocks/road_sign_back_rect_2" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9e.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_9e.json deleted file mode 100644 index ee83f63..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9e.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_9e", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9f.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_9f.json deleted file mode 100644 index 6521baf..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9f.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_9f", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9g.json b/src/main/resources/assets/df-roads/blockstates/road_sign_info_9g.json deleted file mode 100644 index 3b77828..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_info_9g.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_info_9g", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_1.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_1.json deleted file mode 100644 index 61a264c..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_1.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_1", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_10.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_10.json deleted file mode 100644 index bb03472..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_10.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_10", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_16.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_16.json deleted file mode 100644 index 640b69e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_16.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_16", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_16a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_16a.json deleted file mode 100644 index 79a656e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_16a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_16a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17.json deleted file mode 100644 index eece600..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_17", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_a.json deleted file mode 100644 index 60931f5..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_17a_a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_b.json deleted file mode 100644 index 20d847e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_17a_b", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_c.json deleted file mode 100644 index 5f4939a..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_17a_c", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_d.json deleted file mode 100644 index b3bbc07..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17a_d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_17a_d", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17b.json deleted file mode 100644 index 28aee77..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_17b", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17c.json deleted file mode 100644 index fbba3c6..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_17c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_17c", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_18.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_18.json deleted file mode 100644 index 621027a..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_18.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_18", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_2.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_2.json deleted file mode 100644 index 5d6b05b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_2.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_2", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_22.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_22.json deleted file mode 100644 index e33d383..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_22.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_22", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_22a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_22a.json deleted file mode 100644 index 5ec465b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_22a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_22a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_3.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_3.json deleted file mode 100644 index 8a366f4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_3.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_3", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_4.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_4.json deleted file mode 100644 index 7d4876b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_4.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_4", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_5.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_5.json deleted file mode 100644 index 3d7bd2f..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_5.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_5", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_6.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_6.json deleted file mode 100644 index e5015e4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_6.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_6", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_7.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_7.json deleted file mode 100644 index 4b2e8a4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_7.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_7", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_8.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_8.json deleted file mode 100644 index be87a56..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_8.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_8", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_9.json b/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_9.json deleted file mode 100644 index 5452ef1..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_mandat_9.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_mandat_9", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_post.json b/src/main/resources/assets/df-roads/blockstates/road_sign_post.json index 2967235..c7fd206 100644 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_post.json +++ b/src/main/resources/assets/df-roads/blockstates/road_sign_post.json @@ -14,7 +14,8 @@ } } }, - "false": { } + "false": { + } }, "up": { "true": { @@ -26,7 +27,8 @@ } } }, - "false": { } + "false": { + } }, "north": { "true": { @@ -38,7 +40,8 @@ } } }, - "false": { } + "false": { + } }, "south": { "true": { @@ -50,7 +53,8 @@ } } }, - "false": { } + "false": { + } }, "east": { "true": { @@ -63,7 +67,8 @@ } } }, - "false": { } + "false": { + } }, "west": { "true": { @@ -76,7 +81,42 @@ } } }, - "false": { } + "false": { + } + }, + "power": { + "0": { + }, + "1": { + }, + "2": { + }, + "3": { + }, + "4": { + }, + "5": { + }, + "6": { + }, + "7": { + }, + "8": { + }, + "9": { + }, + "10": { + }, + "11": { + }, + "12": { + }, + "13": { + }, + "14": { + }, + "15": { + } } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_priority_1.json b/src/main/resources/assets/df-roads/blockstates/road_sign_priority_1.json deleted file mode 100644 index 89b3354..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_priority_1.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_priority_1", - "back": "df-roads:blocks/road_sign_priority_1_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_priority_2.json b/src/main/resources/assets/df-roads/blockstates/road_sign_priority_2.json deleted file mode 100644 index 1b41eda..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_priority_2.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_priority_2", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_priority_3a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_priority_3a.json deleted file mode 100644 index 0cb4e36..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_priority_3a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_priority_3a", - "back": "df-roads:blocks/road_sign_priority_3_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_priority_3b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_priority_3b.json deleted file mode 100644 index 390eeb9..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_priority_3b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_priority_3b", - "back": "df-roads:blocks/road_sign_priority_3_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_1.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_1.json deleted file mode 100644 index 88857a4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_1.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_1", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a100.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a100.json deleted file mode 100644 index db2cbae..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a100.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10a100", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a20.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a20.json deleted file mode 100644 index 1bc9474..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a20.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10a20", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a30.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a30.json deleted file mode 100644 index 6d86717..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a30.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10a30", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a40.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a40.json deleted file mode 100644 index 76fa637..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a40.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10a40", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a50.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a50.json deleted file mode 100644 index c415200..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a50.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10a50", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a60.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a60.json deleted file mode 100644 index 9baa6a0..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a60.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10a60", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a70.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a70.json deleted file mode 100644 index 9734e92..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a70.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10a70", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a80.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a80.json deleted file mode 100644 index 2ce7f80..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10a80.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10a80", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b100.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b100.json deleted file mode 100644 index 5178e53..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b100.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10b100", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b20.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b20.json deleted file mode 100644 index 72098b6..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b20.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10b20", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b30.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b30.json deleted file mode 100644 index abcf132..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b30.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10b30", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b40.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b40.json deleted file mode 100644 index 8a9cc08..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b40.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10b40", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b50.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b50.json deleted file mode 100644 index 7a931fd..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b50.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10b50", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b60.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b60.json deleted file mode 100644 index 0342ab9..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b60.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10b60", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b70.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b70.json deleted file mode 100644 index 4a4647d..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b70.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10b70", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b80.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b80.json deleted file mode 100644 index d2e2d64..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_10b80.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_10b80", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_11.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_11.json deleted file mode 100644 index 3387775..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_11.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_11", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_11a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_11a.json deleted file mode 100644 index af05d94..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_11a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_11a", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_11b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_11b.json deleted file mode 100644 index a91bc73..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_11b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_11b", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_12.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_12.json deleted file mode 100644 index f9784ac..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_12.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_12", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13a.json deleted file mode 100644 index ceecff9..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_13a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13b.json deleted file mode 100644 index 45e784b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_13b", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13d.json deleted file mode 100644 index 92b654b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_13d", - "back": "df-roads:blocks/road_sign_back_rect" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13e.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13e.json deleted file mode 100644 index 039c74b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_13e.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_13e", - "back": "df-roads:blocks/road_sign_back_square" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_14.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_14.json deleted file mode 100644 index a0b2ca8..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_14.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_14", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_2.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_2.json deleted file mode 100644 index 2a5db11..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_2.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_2", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_3a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_3a.json deleted file mode 100644 index 5417fb0..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_3a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_3a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_3b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_3b.json deleted file mode 100644 index f02d507..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_3b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_3b", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_3c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_3c.json deleted file mode 100644 index 53ff9ae..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_3c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_3c", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4a.json deleted file mode 100644 index b19b032..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_4a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4b.json deleted file mode 100644 index ffd68c3..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_4b", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4c.json deleted file mode 100644 index 9401493..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_4c", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4d.json deleted file mode 100644 index 95ba1c4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_4d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_4d", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_5.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_5.json deleted file mode 100644 index db5f6b0..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_5.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_5", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6a.json deleted file mode 100644 index b2c7fcf..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_6a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6b.json deleted file mode 100644 index 81a03db..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_6b", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6c.json deleted file mode 100644 index 340aae7..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_6c", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6d.json deleted file mode 100644 index ee576da..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_6d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_6d", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7a.json deleted file mode 100644 index a6596d0..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_7a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7al.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7al.json deleted file mode 100644 index 5ede9e5..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7al.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_7al", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7aw.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7aw.json deleted file mode 100644 index 1e174b7..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7aw.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_7aw", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7b.json deleted file mode 100644 index d66bef6..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_7b", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7c.json deleted file mode 100644 index d828481..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_7c", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7e.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7e.json deleted file mode 100644 index 09fb071..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7e.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_7e", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7f.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7f.json deleted file mode 100644 index 190c601..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_7f.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_7f", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_8a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_8a.json deleted file mode 100644 index bd1ecf5..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_8a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_8a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_8b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_8b.json deleted file mode 100644 index c959db7..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_8b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_8b", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_8c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_8c.json deleted file mode 100644 index 7920094..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_8c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_8c", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9a.json deleted file mode 100644 index 841cb58..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_9a", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9b.json deleted file mode 100644 index 04465ab..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_9b", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9c.json deleted file mode 100644 index 5efb343..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_9c", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9d.json deleted file mode 100644 index a12f91f..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_prohib_9d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_prohib_9d", - "back": "df-roads:blocks/road_sign_back_round" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_1.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_1.json deleted file mode 100644 index 7970e4e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_1.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_1", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10.json deleted file mode 100644 index 52dae0e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_10", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10a.json deleted file mode 100644 index 24096af..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_10a", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10b.json deleted file mode 100644 index 32816e6..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_10b", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10c.json deleted file mode 100644 index 48b4f86..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_10c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_10c", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_11a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_11a.json deleted file mode 100644 index 7d91d5d..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_11a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_11a", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_11b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_11b.json deleted file mode 100644 index e475946..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_11b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_11b", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_12.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_12.json deleted file mode 100644 index 52038a0..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_12.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_12", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_13.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_13.json deleted file mode 100644 index fdb4d77..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_13.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_13", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_14.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_14.json deleted file mode 100644 index e9f6762..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_14.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_14", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_15.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_15.json deleted file mode 100644 index a05d872..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_15.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_15", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_16.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_16.json deleted file mode 100644 index 5e48c6b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_16.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_16", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2a.json deleted file mode 100644 index 552543d..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_2a", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2b.json deleted file mode 100644 index bee1b69..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_2b", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2c.json deleted file mode 100644 index 693a79b..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_2c", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2d.json deleted file mode 100644 index 046b641..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_2d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_2d", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_3a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_3a.json deleted file mode 100644 index 86a21d1..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_3a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_3a", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_3b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_3b.json deleted file mode 100644 index ebade36..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_3b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_3b", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_4.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_4.json deleted file mode 100644 index 9ae51ea..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_4.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_4", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6a.json deleted file mode 100644 index c54ff83..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6a", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6b.json deleted file mode 100644 index 615cb80..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6b", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_i_l.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_i_l.json deleted file mode 100644 index a747f3c..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_i_l.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6c_i_l", - "back": "df-roads:blocks/road_sign_warn_6c_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_i_r.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_i_r.json deleted file mode 100644 index 5ce4b8d..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_i_r.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6c_i_r", - "back": "df-roads:blocks/road_sign_warn_6c_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_ii_l.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_ii_l.json deleted file mode 100644 index 9b25d34..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_ii_l.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6c_ii_l", - "back": "df-roads:blocks/road_sign_warn_6c_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_ii_r.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_ii_r.json deleted file mode 100644 index 4d781e1..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_ii_r.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6c_ii_r", - "back": "df-roads:blocks/road_sign_warn_6c_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_iii_l.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_iii_l.json deleted file mode 100644 index 227cada..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_iii_l.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6c_iii_l", - "back": "df-roads:blocks/road_sign_warn_6c_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_iii_r.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_iii_r.json deleted file mode 100644 index b136430..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6c_iii_r.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6c_iii_r", - "back": "df-roads:blocks/road_sign_warn_6c_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_a.json deleted file mode 100644 index 6a49057..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6d_a", - "back": "df-roads:blocks/road_sign_warn_6d_a_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_b.json deleted file mode 100644 index 3e78e02..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6d_b", - "back": "df-roads:blocks/road_sign_warn_6d_b_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_c.json deleted file mode 100644 index 737e8d4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6d_c", - "back": "df-roads:blocks/road_sign_warn_6d_c_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_d.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_d.json deleted file mode 100644 index e56acb3..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_6d_d.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_6d_d", - "back": "df-roads:blocks/road_sign_warn_6d_d_back" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_7.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_7.json deleted file mode 100644 index d12ae06..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_7.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_7", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_7a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_7a.json deleted file mode 100644 index 781aeb4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_7a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_7a", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_8a.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_8a.json deleted file mode 100644 index 3d637b1..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_8a.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_8a", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_8b.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_8b.json deleted file mode 100644 index 059aebf..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_8b.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_8b", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_8c.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_8c.json deleted file mode 100644 index 3950a4e..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_8c.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_8c", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_9.json b/src/main/resources/assets/df-roads/blockstates/road_sign_warn_9.json deleted file mode 100644 index ec9b9e4..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_sign_warn_9.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "forge_marker": 1, - "defaults" : { - "textures": { - "front": "df-roads:blocks/road_sign_warn_9", - "back": "df-roads:blocks/road_sign_back_triangle" - } - }, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_slope.json b/src/main/resources/assets/df-roads/blockstates/road_slope.json deleted file mode 100644 index 1ef54d0..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_slope.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_town_sign.json b/src/main/resources/assets/df-roads/blockstates/road_town_sign.json deleted file mode 100644 index ecd8a79..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_town_sign.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "facing": { - "north": { - "model": "df-roads:road_town_sign", - "uvlock": false - }, - "east": { - "model": "df-roads:road_town_sign", - "y": 90, - "uvlock": false - }, - "south": { - "model": "df-roads:road_town_sign", - "y": 180, - "uvlock": false - }, - "west": { - "model": "df-roads:road_town_sign", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_town_sign", - "uvlock": true - }, - "post_south": { - "model": "df-roads:road_town_sign", - "y": 180, - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_traffic_light.json b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_auto.json similarity index 91% rename from src/main/resources/assets/df-roads/blockstates/road_traffic_light.json rename to src/main/resources/assets/df-roads/blockstates/road_traffic_light_auto.json index f83cec3..5de7a6e 100644 --- a/src/main/resources/assets/df-roads/blockstates/road_traffic_light.json +++ b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_auto.json @@ -105,6 +105,40 @@ } } } - ] + ], + "power": { + "0": { + }, + "1": { + }, + "2": { + }, + "3": { + }, + "4": { + }, + "5": { + }, + "6": { + }, + "7": { + }, + "8": { + }, + "9": { + }, + "10": { + }, + "11": { + }, + "12": { + }, + "13": { + }, + "14": { + }, + "15": { + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_green.json b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_green.json deleted file mode 100644 index 6c6a6f1..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_green.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "facing": { - "south": { - "model": "df-roads:road_traffic_light_green", - "uvlock": false - }, - "west": { - "model": "df-roads:road_traffic_light_green", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_traffic_light_green", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_traffic_light_green", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_traffic_light_green", - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_green_dyn.json b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_green_dyn.json deleted file mode 100644 index ed0bca2..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_green_dyn.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "control_mode": {"redstone_controlled":{}, "command_controlled": {}, "deactivated": {}}, - "powered": {"true": {}, "false": {} }, - "facing": { - "south": { - "model": "df-roads:road_traffic_light_green", - "uvlock": false - }, - "west": { - "model": "df-roads:road_traffic_light_green", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_traffic_light_green", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_traffic_light_green", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_traffic_light_green", - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_manual.json b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_manual.json deleted file mode 100644 index d951283..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_manual.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "facing": { - "south": { - "model": "df-roads:road_traffic_light", - "uvlock": false - }, - "west": { - "model": "df-roads:road_traffic_light", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_traffic_light", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_traffic_light", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_traffic_light_1", - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_red.json b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_red.json deleted file mode 100644 index 0260e05..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_red.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "facing": { - "south": { - "model": "df-roads:road_traffic_light_red", - "uvlock": false - }, - "west": { - "model": "df-roads:road_traffic_light_red", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_traffic_light_red", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_traffic_light_red", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_traffic_light_red", - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_red_dyn.json b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_red_dyn.json deleted file mode 100644 index e4521f2..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_red_dyn.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "control_mode": {"redstone_controlled":{}, "command_controlled": {}, "deactivated": {}}, - "powered": {"true": {}, "false": {} }, - "facing": { - "south": { - "model": "df-roads:road_traffic_light_red", - "uvlock": false - }, - "west": { - "model": "df-roads:road_traffic_light_red", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_traffic_light_red", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_traffic_light_red", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_traffic_light_red", - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_yellow.json deleted file mode 100644 index 7754226..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_yellow.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "facing": { - "south": { - "model": "df-roads:road_traffic_light_yellow", - "uvlock": false - }, - "west": { - "model": "df-roads:road_traffic_light_yellow", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_traffic_light_yellow", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_traffic_light_yellow", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_traffic_light_yellow", - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_yellow_blinking.json b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_yellow_blinking.json deleted file mode 100644 index 14ca942..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_yellow_blinking.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "control_mode": {"redstone_controlled":{}, "command_controlled": {}, "deactivated": {}}, - "powered": {"true": {}, "false": {} }, - "facing": { - "south": { - "model": "df-roads:road_traffic_light_yellow_blinking", - "uvlock": false - }, - "west": { - "model": "df-roads:road_traffic_light_yellow_blinking", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_traffic_light_yellow_blinking", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_traffic_light_yellow_blinking", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_traffic_light_yellow_blinking", - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_yellow_dyn.json b/src/main/resources/assets/df-roads/blockstates/road_traffic_light_yellow_dyn.json deleted file mode 100644 index 95b0e29..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_traffic_light_yellow_dyn.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "control_mode": {"redstone_controlled":{}, "command_controlled": {}, "deactivated": {}}, - "powered": {"true": {}, "false": {} }, - "facing": { - "south": { - "model": "df-roads:road_traffic_light_yellow", - "uvlock": false - }, - "west": { - "model": "df-roads:road_traffic_light_yellow", - "y": 90, - "uvlock": false - }, - "north": { - "model": "df-roads:road_traffic_light_yellow", - "y": 180, - "uvlock": false - }, - "east": { - "model": "df-roads:road_traffic_light_yellow", - "y": 270, - "uvlock": false - } - }, - "down": { - "true": { - "submodel": { - "post_down": { - "model": "df-roads:road_sign_connector", - "uvlock": true - } - } - }, - "false": { } - }, - "up": { - "true": { - "submodel": { - "post_up": { - "model": "df-roads:road_sign_connector", - "x": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "south": { - "true": { - "submodel": { - "post_north": { - "model": "df-roads:road_sign_connector", - "x": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "north": { - "true": { - "submodel": { - "post_south": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 180, - "uvlock": true - } - } - }, - "false": { } - }, - "west": { - "true": { - "submodel": { - "post_east": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 90, - "uvlock": true - } - } - }, - "false": { } - }, - "east": { - "true": { - "submodel": { - "post_west": { - "model": "df-roads:road_sign_connector", - "x": 90, - "y": 270, - "uvlock": true - } - } - }, - "false": { } - }, - "inventory": [ - { - "submodel": { - "post_north": { - "model": "df-roads:road_traffic_light_yellow", - "uvlock": true - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_white.json b/src/main/resources/assets/df-roads/blockstates/road_white.json deleted file mode 100644 index 2a658c7..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_white.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_white" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_white" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_white" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_white" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_white_half.json b/src/main/resources/assets/df-roads/blockstates/road_white_half.json deleted file mode 100644 index 348a343..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_white_half.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_white_half_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_white_half_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_white_half_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_white_half_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_white_half_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_white_half_yellow.json deleted file mode 100644 index fa9d64d..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_white_half_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_white_half_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_white_half_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_white_half_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_white_half_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_white_quarter.json b/src/main/resources/assets/df-roads/blockstates/road_white_quarter.json deleted file mode 100644 index 6a3eeb9..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_white_quarter.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_white_quarter_north" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_white_quarter_east" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_white_quarter_south" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_white_quarter_west" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/blockstates/road_white_quarter_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_white_quarter_yellow.json deleted file mode 100644 index 05c1466..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_white_quarter_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_white_quarter_north_yellow" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_white_quarter_east_yellow" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_white_quarter_south_yellow" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_white_quarter_west_yellow" - } - } - } - } -} diff --git a/src/main/resources/assets/df-roads/blockstates/road_yellow.json b/src/main/resources/assets/df-roads/blockstates/road_yellow.json deleted file mode 100644 index 2a658c7..0000000 --- a/src/main/resources/assets/df-roads/blockstates/road_yellow.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "slope": { - "true":{ - "model": "df-roads:road_slope" - }, - "false": { - "model": "df-roads:road" - } - }, - "facing": { - "north": { - "y": 180 - }, - "south": { - "y": 0 - }, - "east": { - "y": 270 - }, - "west": { - "y": 90 - } - }, - "slope_facing": { - "north": { - "textures": { - "top": "df-roads:blocks/road_white" - } - }, - "east": { - "textures": { - "top": "df-roads:blocks/road_white" - } - }, - "south": { - "textures": { - "top": "df-roads:blocks/road_white" - } - }, - "west": { - "textures": { - "top": "df-roads:blocks/road_white" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/lang/de_de.lang b/src/main/resources/assets/df-roads/lang/de_de.lang index e0971c7..bf7087e 100644 --- a/src/main/resources/assets/df-roads/lang/de_de.lang +++ b/src/main/resources/assets/df-roads/lang/de_de.lang @@ -211,11 +211,9 @@ tile.road_guardrail.name=Leitschiene tile.road_lantern.name=Laterne tile.road_traffic_light.name=Ampel (automatisiert) tile.road_traffic_light_manual.name=Ampel (per Hand) -tile.road_traffic_light_red.name=Ampel (Rot) +tile.road_traffic_light_red.name=Ampel (festgelegt Rot) tile.road_traffic_light_yellow.name=Ampel (festgelegt Gelb) -tile.road_traffic_light_yellow_dyn.name=Ampel (wechselnd Gelb) -tile.road_traffic_light_yellow_blinking.name=Ampel (Blinker Gelb) -tile.road_traffic_light_green.name=Ampel (Grün) +tile.road_traffic_light_green.name=Ampel (festgelegt Grün) tile.road_pedestrian_traffic_light.name=Fußgängerampel (automatisiert) tile.road_pedestrian_traffic_light_manual.name=Fußgängerampel (per Hand) tile.road_excl_zone.name=Speerfläche diff --git a/src/main/resources/assets/df-roads/lang/en_uk.lang b/src/main/resources/assets/df-roads/lang/en_uk.lang index 7bebacf..e17b635 100644 --- a/src/main/resources/assets/df-roads/lang/en_uk.lang +++ b/src/main/resources/assets/df-roads/lang/en_uk.lang @@ -1,5 +1,6 @@ item.item_tar.name=Tar item.item_wrench.name=Wrench +item.item_traffic_remote.name=Traffic remote item.round_sign_template.name=Round Sign Template item.square_sign_template.name=Rectangular Sign Template item.triangle_sign_template.name=Triangular Sign Template @@ -206,17 +207,33 @@ tile.road_sign_info_17a.name=Town Sign tile.road_sign_info_17b.name=End of Town Sign tile.road_sign_info_23.name=Two lanes merge into one Sign tile.road_sign_info_23b.name=Two lanes merge into one Sign (German) +tile.road_sign_info_24.name=Cut across arrow +tile.road_sign_info_25a.name=Chevron (left curve) +tile.road_sign_info_25b.name=Chevron (right curve) +tile.road_sign_info_26a.name=One-way lane +tile.road_sign_info_26b.name=Two lanes (one-way) +tile.road_sign_info_26c.name=Three lanes (one-way) +tile.road_sign_info_27a.name=Two lanes merge into one +tile.road_sign_info_27b.name=Three lanes merge into two +tile.road_sign_info_27c.name=Four lanes merge into three +tile.road_sign_info_28a.name=Lanes split +tile.road_sign_info_28b.name=Right lane splits + +tile.road_sign_meta_1.name=Reminder Sign +tile.road_sign_meta_2a.name=50 m ahead Sign +tile.road_sign_meta_2b.name=100 m ahead Sign +tile.road_sign_meta_2c.name=150 m ahead Sign +tile.road_sign_meta_2d.name=300 m ahead Sign +tile.road_sign_meta_2e.name=500 m ahead Sign tile.road_guardrail.name=Guardrail tile.road_lantern.name=Lantern -tile.road_traffic_light.name=Traffic Lights (automated) +tile.road_traffic_light_auto.name=Traffic Lights (automated) tile.road_traffic_light_manual.name=Traffic Lights (manual) -tile.road_traffic_light_red.name=Traffic Light (red) +tile.road_traffic_light_red.name=Traffic Light (fixed red) tile.road_traffic_light_yellow.name=Traffic Light (fixed yellow) -tile.road_traffic_light_yellow_dyn.name=Traffic Light (switching yellow) -tile.road_traffic_light_yellow_blinking.name=Traffic Light (blinking yellow) -tile.road_traffic_light_green.name=Traffic Light (green) -tile.road_pedestrian_traffic_light.name=Pedestrian Traffic Lights (automated) +tile.road_traffic_light_green.name=Traffic Light (fixed green) +tile.road_pedestrian_traffic_light_auto.name=Pedestrian Traffic Lights (automated) tile.road_pedestrian_traffic_light_manual.name=Pedestrian Traffic Lights (manual) tile.road_excl_zone.name=Crosshatch Block tile.road_excl_zone_line.name=Crosshatch with straight Line @@ -242,6 +259,7 @@ tile.road_excl_zone_split_out_l_yellow.name=Crosshatch with splitting Lines (lef tile.road_crosswalk_yellow.name=Crosswalk (Yellow) tile.road_sidewalk.name=Sidewalk Curb tile.road_sign_post.name=Sign Post +tile.road_junction_marker.name=Junction marker tile.road_slope.name=Slope tile.road_line_slope.name=Slope with Line tile.sign_printer.name=Sign Printer @@ -259,3 +277,122 @@ gui.sign_printer.warning=Warning gui.sign_printer.mandatory=Mandatory gui.sign_printer.prohibitory=Prohibitory gui.sign_printer.others=Others + +command.trafficlights.invalidsender=§4This command may only be executed by a player. +command.trafficlights.invalidhelditem=§4You must hold a traffic remote to perform this command. + +command.trafficlights.set.alreadyPending§4=You have already a traffic lights set pending. You must finish or cancel it before you may create a new one. +command.trafficlights.set.duplicatename=§4Another traffic lights set already holds this name. +command.trafficlights.set.creating=Starting creation of a traffic lights set. Right-click on a traffic light with the remote to add it to the current group. Use §7/trafficlights set save §rto save and §7/trafficlights set cancel §rto cancel. +command.trafficlights.set.replacing=Traffic lights reconfiguration started. Set it up as if you were creating a new set. §5§lCaution: §r§dThe traffic light set with name %s §dwill be §lremoved §r§dand replaced with the new one when you will use §7/trafficlights set save. §dTo cancel, use §7/trafficlights set cancel. +command.trafficlights.set.illegalname=§4Set name may only consist of alphanumeric characters and should start with a letter. +command.trafficlights.set.noname=§4You must name the new traffic lights set. +command.trafficlights.set.cancelled=Pending traffic lights set cancelled. +command.trafficlights.set.none=§4You have no pending traffic lights set. +command.trafficlights.set.empty=§4Your traffic lights set must contains at least two lights groups. +command.trafficlights.set.saved=Traffic lights set created. Starting lights synchronisation... +command.trafficlights.set.list=Available traffic lights sets: %s +command.trafficlights.set.list.empty=There is no available traffic lights sets yet. +command.trafficlights.set.renamed=Traffic lights set %1$s was successfully renamed to %2$s. +command.trafficlights.set.nosuchset=§4No traffic lights set with name %s exists in the current world. +command.trafficlights.set.editing=Now editing set %s. You may switch between its groups with §7/trafficlights group select §rto update their traffic lights. Use §7/trafficlights set save §rto save and §7/trafficlights set cancel §rto cancel editing. +command.trafficlights.set.deleted=Traffic lights set %s was deleted, halting their synchronisation. + +command.trafficlights.group.empty=§4Current group does not contain any traffic lights. +command.trafficlights.group.invalidargs=§4Duration and delay must be non negative numbers. Duration should not be zero. +command.trafficlights.group.finished=Group complete. You may select traffic lights for the next group. +command.trafficlights.group.notfinished=§4You must finish current group with §7/trafficlights group finish §4before to finish the set or to select a new group. +command.trafficlights.group.outofbounds=§4Given index was out of bounds and does not match any groups. It should be between 0 and %s. Use 1 for first group and so on. If you don't exactly know how many groups are created, use 0 to reach last group directly. +command.trafficlights.group.selected=Group %s selected. Traffic lights will be added to that group until you select a new one. +command.trafficlights.group.created=New group was added at the bottom of the list and selected. Traffic lights will be added to that group until you select a new one. +command.trafficlights.group.removed=Group removed. Last group is now selected. +command.trafficlights.group.moved=Group %s was successfully moved to %s. This group is still selected. + +command.trafficlights.light.invalidmode=§4You must use a wrench to set up that traffic light before it may receive remote commands. +command.trafficlights.light.duplicate=§4Traffic light at %1$s %2$s %3$s is already implied in another traffic lights set. +command.trafficlights.light.added=Traffic light at %1$s %2$s %3$s added to current group. +command.trafficlights.light.removed=Traffic light at %1$s %2$s %3$s removed from current group. +command.trafficlights.light.notfound=§4Current group contains no traffic light with coordinates %1$s %2$s %3$s. +command.trafficlights.light.notalight=§4Block at %1$s %2$s %3$s is not a dynamic traffic light. + +command.trafficlights.usage=/trafficlights §rAdd help as argument of that command or any of its subcommands to get more information about it. +command.trafficlights.help=Base command for managing traffic lights. Add help as argument of that command or any of its subcommands to get more information about it. + +command.trafficlights.set.usage=/trafficlights set +command.trafficlights.set.help=Manage traffic lights sets. Traffic lights from a same set are synchronised. See also §7/trafficlights group help. + +command.trafficlights.set.cancel.usage=/trafficlights set cancel +command.trafficlights.set.cancel.help=Aborts creation of the traffic light set (if such a creation was in progress). + +command.trafficlights.set.create.usage=/trafficlights set create +command.trafficlights.set.create.help=Starts a new traffic lights set. Name must be unique, alphanumeric and must start with a letter. + +command.trafficlights.set.save.usage=/trafficlights set save +command.trafficlights.set.save.help=Saves the being-created traffic lights set and starts synchronisation. + +command.trafficlights.set.remove.usage=/trafficlights set remove +command.trafficlights.set.remove.help=Deletes the traffic lights set with the given name. + +command.trafficlights.set.list.usage=/trafficlights set list +command.trafficlights.set.list.help=Gets the list of created sets in this world. + +command.trafficlights.set.check.usage=/trafficlights set check +command.trafficlights.set.check.help=Checks and shows information on given traffic lights set. + +command.trafficlights.set.rename.usage=/trafficlights set rename +command.trafficlights.set.rename.help=Renames a pre-existing traffic lights set with the new given name. + +command.trafficlights.set.replace.usage=/trafficlights set replace +command.trafficlights.set.replace.help=Entirely reconfigures the given traffic lights set, as if you were creating a new one. The traffic lights set will not be replaced unless you use §7/trafficlights set save. + +command.trafficlights.set.edit.usage=/trafficlights set edit +command.trafficlights.set.edit.help=Loads given traffic lights set to allow its modification. Traffic lights groups are automatically imported. + +command.trafficlights.group.usage=/trafficlights group +command.trafficlights.group.help=Manage traffic lights groups inside the being-created set. When you create a set, a group is automatically added. Traffic ligths from a same group shall be green simultaneously for the given duration, while the others shall be red. + +command.trafficlights.group.finish.usage=/trafficlights group finish [yellow light duration] +command.trafficlights.group.finish.help=Completes current traffic lights group and starts a new one. Duration means green light duration, delay adds delay before traffic lights from other groups to turn green (in addition to yellow light duration). + +command.trafficlights.group.reset.usage=/trafficlights group reset +command.trafficlights.group.reset.help=Deletes all traffic lights from current group. + +command.trafficlights.group.select.usage=/trafficlights group select +command.trafficlights.group.select.help=Selects group matching the given number. New traffic lights will be added in this group until another group is selected. Giving value 0 to allows to select last group. + +command.trafficlights.group.list.usage=/trafficlights group list +command.trafficlights.group.list.help=Shows list and details of groups in the being-edited set. + +command.trafficlights.group.remove.usage=/trafficlights group remove +command.trafficlights.group.remove.help=Removes the currently selected traffic lights group from the set. Last group of the set is then selected. + +command.trafficlights.group.add.usage=/trafficlights group add +command.trafficlights.group.add.help=Adds and selects an empty traffic lights group at the bottom of the list. If there is already an empty group at the bottom of the list, it is selected but no new group will be created. + +command.trafficlights.group.move.usage=/trafficlights group move +command.trafficlights.group.move.help=Moves the selected group to new position. Position must not be negative nor greater than groups count - use 0 to move group at the bottom of the list. (Groups' order will determine order traffic lights switch to green.) + +command.trafficlights.light.usage=/trafficlights light +command.trafficlights.light.help=Manage traffic lights for currently selected group. + +command.trafficlights.light.add.usage=/trafficlights light add +command.trafficlights.light.add.help=Adds traffic light at given coordinates to current group. The traffic light must not already be added to another group or set. This command is equivalent to clicking on the traffic light with a traffic remote. + +command.trafficlights.light.remove.usage=/trafficlights light remove +command.trafficlights.light.remove.help=Removes traffic light at given coordinates from the current group. + +dfroads.trafficlight.mode.deactivated=Traffic light deactivated. +dfroads.trafficlight.mode.redstone_controlled=Traffic light redstone-controlled. +dfroads.trafficlight.mode.command_controlled=Traffic light remotely controlled. +dfroads.trafficlight.mode.deprecated=§cThis traffic light is involved in a remote traffic lights synchronisation set. It will no longer be synchronised unless you turn it back into the appropriate mode. + +dfroads.partial.ok=OK +dfroads.partial.destroyed=DESTROYED +dfroads.partial.illegalmode=ILLEGAL MODE +dfroads.partial.duplicated=DUPLICATED +dfroads.partial.group=Group %s +dfroads.partial.set=Set %s +dfroads.partial.groupprop=(duration=%s seconds, yellow light=%s seconds, delay=%s seconds): +dfroads.partial.current=(current) + +dfroads.partial.road_height=(height %s) \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/lang/en_us.lang b/src/main/resources/assets/df-roads/lang/en_us.lang index 7bebacf..fd89faf 100644 --- a/src/main/resources/assets/df-roads/lang/en_us.lang +++ b/src/main/resources/assets/df-roads/lang/en_us.lang @@ -1,5 +1,6 @@ item.item_tar.name=Tar item.item_wrench.name=Wrench +item.item_traffic_remote.name=Traffic remote item.round_sign_template.name=Round Sign Template item.square_sign_template.name=Rectangular Sign Template item.triangle_sign_template.name=Triangular Sign Template @@ -206,17 +207,33 @@ tile.road_sign_info_17a.name=Town Sign tile.road_sign_info_17b.name=End of Town Sign tile.road_sign_info_23.name=Two lanes merge into one Sign tile.road_sign_info_23b.name=Two lanes merge into one Sign (German) +tile.road_sign_info_24.name=Cut across arrow +tile.road_sign_info_25a.name=Chevron (left curve) +tile.road_sign_info_25b.name=Chevron (right curve) +tile.road_sign_info_26a.name=One-way lane +tile.road_sign_info_26b.name=Two lanes (one-way) +tile.road_sign_info_26c.name=Three lanes (one-way) +tile.road_sign_info_27a.name=Two lanes merge into one +tile.road_sign_info_27b.name=Three lanes merge into two +tile.road_sign_info_27c.name=Four lanes merge into three +tile.road_sign_info_28a.name=Lanes split +tile.road_sign_info_28b.name=Right lane splits + +tile.road_sign_meta_1.name=Reminder Sign +tile.road_sign_meta_2a.name=50 m ahead Sign +tile.road_sign_meta_2b.name=100 m ahead Sign +tile.road_sign_meta_2c.name=150 m ahead Sign +tile.road_sign_meta_2d.name=300 m ahead Sign +tile.road_sign_meta_2e.name=500 m ahead Sign tile.road_guardrail.name=Guardrail tile.road_lantern.name=Lantern -tile.road_traffic_light.name=Traffic Lights (automated) +tile.road_traffic_light_auto.name=Traffic Lights (automated) tile.road_traffic_light_manual.name=Traffic Lights (manual) -tile.road_traffic_light_red.name=Traffic Light (red) +tile.road_traffic_light_red.name=Traffic Light (fixed red) tile.road_traffic_light_yellow.name=Traffic Light (fixed yellow) -tile.road_traffic_light_yellow_dyn.name=Traffic Light (switching yellow) -tile.road_traffic_light_yellow_blinking.name=Traffic Light (blinking yellow) -tile.road_traffic_light_green.name=Traffic Light (green) -tile.road_pedestrian_traffic_light.name=Pedestrian Traffic Lights (automated) +tile.road_traffic_light_green.name=Traffic Light (fixed green) +tile.road_pedestrian_traffic_light_auto.name=Pedestrian Traffic Lights (automated) tile.road_pedestrian_traffic_light_manual.name=Pedestrian Traffic Lights (manual) tile.road_excl_zone.name=Crosshatch Block tile.road_excl_zone_line.name=Crosshatch with straight Line @@ -242,6 +259,7 @@ tile.road_excl_zone_split_out_l_yellow.name=Crosshatch with splitting Lines (lef tile.road_crosswalk_yellow.name=Crosswalk (Yellow) tile.road_sidewalk.name=Sidewalk Curb tile.road_sign_post.name=Sign Post +tile.road_junction_marker.name=Junction marker tile.road_slope.name=Slope tile.road_line_slope.name=Slope with Line tile.sign_printer.name=Sign Printer @@ -259,3 +277,123 @@ gui.sign_printer.warning=Warning gui.sign_printer.mandatory=Mandatory gui.sign_printer.prohibitory=Prohibitory gui.sign_printer.others=Others + +command.trafficlights.invalidsender=§4This command may only be executed by a player. +command.trafficlights.invalidhelditem=§4You must hold a traffic remote to perform this command. + +command.trafficlights.set.alreadyPending§4=You have already a traffic lights set pending. You must finish or cancel it before you may create a new one. +command.trafficlights.set.duplicatename=§4Another traffic lights set already holds this name. +command.trafficlights.set.creating=Starting creation of a traffic lights set. Right-click on a traffic light with the remote to add it to the current group. Use §7/trafficlights set save §rto save and §7/trafficlights set cancel §rto cancel. +command.trafficlights.set.replacing=Traffic lights reconfiguration started. Set it up as if you were creating a new set. §5§lCaution: §r§dThe traffic light set with name %s §dwill be §lremoved §r§dand replaced with the new one when you will use §7/trafficlights set save. §dTo cancel, use §7/trafficlights set cancel. +command.trafficlights.set.illegalname=§4Set name may only consist of alphanumeric characters and should start with a letter. +command.trafficlights.set.noname=§4You must name the new traffic lights set. +command.trafficlights.set.cancelled=Pending traffic lights set cancelled. +command.trafficlights.set.none=§4You have no pending traffic lights set. +command.trafficlights.set.empty=§4Your traffic lights set must contains at least two lights groups. +command.trafficlights.set.list.empty=There is no available traffic lights sets yet. +command.trafficlights.set.list=Available traffic lights sets: %s +command.trafficlights.set.renamed=Traffic lights set %1$s was successfully renamed to %2$s. +command.trafficlights.set.saved=Traffic lights set created. Starting lights synchronization... +command.trafficlights.set.nosuchset=§4No traffic lights set with name %s §4exists in the current world. +command.trafficlights.set.editing=Now editing set %s. You may switch between its groups with §7/trafficlights group select §rto update their traffic lights. Use §7/trafficlights set save §rto save and §7/trafficlights set cancel §rto cancel editing. +command.trafficlights.set.deleted=Traffic lights set %s was deleted, halting their synchronization. + + +command.trafficlights.group.empty=§4Current group does not contain any traffic lights. +command.trafficlights.group.invalidargs=§4Duration and delay must be non negative numbers. Duration should not be zero. +command.trafficlights.group.finished=Group complete. You may select traffic lights for the next group. +command.trafficlights.group.notfinished=§4You must finish current group with §7/trafficlights group finish §4before to finish the set or to select a new group. +command.trafficlights.group.outofbounds=§4Given index was out of bounds and does not match any groups. It should be between 0 and %s§4. Use 1 for first group and so on. If you don't exactly know how many groups are created, use 0 to reach last group directly. +command.trafficlights.group.selected=Group %s selected. Traffic lights will be added to that group until you select a new one. +command.trafficlights.group.created=New group was added at the bottom of the list and selected. Traffic lights will be added to that group until you select a new one. +command.trafficlights.group.removed=Group removed. Last group is now selected. +command.trafficlights.group.moved=Group %s was successfully moved to %s. This group is still selected. + +command.trafficlights.light.invalidmode=§4You must use a wrench to set up that traffic light before it may receive remote commands. +command.trafficlights.light.duplicate=§4Traffic light at %1$s %2$s %3$s §4is already implied in another traffic lights set. +command.trafficlights.light.added=Traffic light at %1$s %2$s %3$s added to current group. +command.trafficlights.light.removed=Traffic light at %1$s %2$s %3$s removed from current group. +command.trafficlights.light.notfound=§4Current group contains no traffic light with coordinates %1$s %2$s %3$s. +command.trafficlights.light.notalight=§4Block at %1$s %2$s %3$s §4is not a dynamic traffic light. + +command.trafficlights.usage=/trafficlights §rAdd §7help as argument of that command or any of its subcommands to get more information about it. +command.trafficlights.help=Base command for managing traffic lights. Add §7help as argument of that command or any of its subcommands to get more information about it. + +command.trafficlights.set.usage=/trafficlights set +command.trafficlights.set.help=Manage traffic lights sets. Traffic lights from a same set are synchronized. See also §7/trafficlights group help. + +command.trafficlights.set.cancel.usage=/trafficlights set cancel +command.trafficlights.set.cancel.help=Aborts creation of the traffic light set (if such a creation was in progress). + +command.trafficlights.set.create.usage=/trafficlights set create +command.trafficlights.set.create.help=Starts a new traffic lights set. Name must be unique, alphanumeric and must start with a letter. + +command.trafficlights.set.save.usage=/trafficlights set save +command.trafficlights.set.save.help=Saves the being-created traffic lights set and starts synchronization. + +command.trafficlights.set.remove.usage=/trafficlights set remove +command.trafficlights.set.remove.help=Deletes the traffic lights set with the given name. + +command.trafficlights.set.list.usage=/trafficlights set list +command.trafficlights.set.list.help=Gets the list of created sets in this world. + +command.trafficlights.set.check.usage=/trafficlights set check +command.trafficlights.set.check.help=Checks and shows information on given traffic lights set. + +command.trafficlights.set.rename.usage=/trafficlights set rename +command.trafficlights.set.rename.help=Renames a pre-existing traffic lights set with the new given name. + +command.trafficlights.set.replace.usage=/trafficlights set replace +command.trafficlights.set.replace.help=Entirely reconfigures the given traffic lights set, as if you were creating a new one. The traffic lights set will not be replaced unless you use §7/trafficlights set save. + +command.trafficlights.set.edit.usage=/trafficlights set edit +command.trafficlights.set.edit.help=Loads given traffic lights set to allow its modification. Traffic lights groups are automatically imported. + +command.trafficlights.group.usage=/trafficlights group +command.trafficlights.group.help=Manage traffic lights groups inside the being-created set. When you create a set, a group is automatically added. Traffic ligths from a same group shall be green simultaneously for the given duration, while the others shall be red. + +command.trafficlights.group.finish.usage=/trafficlights group finish [yellow light duration] +command.trafficlights.group.finish.help=Completes current traffic lights group and starts a new one. Duration means green light duration, delay adds delay before traffic lights from other groups to turn green (in addition to yellow light duration). + +command.trafficlights.group.reset.usage=/trafficlights group reset +command.trafficlights.group.reset.help=Deletes all traffic lights from current group. + +command.trafficlights.group.select.usage=/trafficlights group select +command.trafficlights.group.select.help=Selects group matching the given number. New traffic lights will be added in this group until another group is selected. Giving value 0 to allows to select last group. + +command.trafficlights.group.list.usage=/trafficlights group list +command.trafficlights.group.list.help=Shows list and details of groups in the being-edited set. + +command.trafficlights.group.remove.usage=/trafficlights group remove +command.trafficlights.group.remove.help=Removes the currently selected traffic lights group from the set. Last group of the set is then selected. + +command.trafficlights.group.add.usage=/trafficlights group add +command.trafficlights.group.add.help=Adds and selects an empty traffic lights group at the bottom of the list. If there is already an empty group at the bottom of the list, it is selected but no new group will be created. + +command.trafficlights.group.move.usage=/trafficlights group move +command.trafficlights.group.move.help=Moves the selected group to new position. Position must not be negative nor greater than groups count - use 0 to move group at the bottom of the list. (Groups' order will determine order traffic lights switch to green.) + +command.trafficlights.light.usage=/trafficlights light +command.trafficlights.light.help=Manage traffic lights for currently selected group. + +command.trafficlights.light.add.usage=/trafficlights light add +command.trafficlights.light.add.help=Adds traffic light at given coordinates to current group. The traffic light must not already be added to another group or set. This command is equivalent to clicking on the traffic light with a traffic remote. + +command.trafficlights.light.remove.usage=/trafficlights light remove +command.trafficlights.light.remove.help=Removes traffic light at given coordinates from the current group. + +dfroads.trafficlight.mode.deactivated=Traffic light deactivated. +dfroads.trafficlight.mode.redstone_controlled=Traffic light redstone-controlled. +dfroads.trafficlight.mode.command_controlled=Traffic light remotely controlled. +dfroads.trafficlight.mode.deprecated=§cThis traffic light is involved in a remote traffic lights synchronization set. It will no longer be synchronized unless you turn it back into the appropriate mode. + +dfroads.partial.ok=OK +dfroads.partial.destroyed=DESTROYED +dfroads.partial.illegalmode=ILLEGAL MODE +dfroads.partial.duplicated=DUPLICATED +dfroads.partial.group=Group %s +dfroads.partial.set=Set +dfroads.partial.groupprop=(duration=%s seconds, yellow light=%s seconds, delay=%s seconds): +dfroads.partial.current=(current) + +dfroads.partial.road_height=(height %s) \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/lang/fr_fr.lang b/src/main/resources/assets/df-roads/lang/fr_fr.lang index 294aabe..ee79bec 100644 --- a/src/main/resources/assets/df-roads/lang/fr_fr.lang +++ b/src/main/resources/assets/df-roads/lang/fr_fr.lang @@ -1,5 +1,6 @@ item.item_tar.name=Goudron item.item_wrench.name=Clé à molette +item.item_traffic_remote.name=Télécommande de feux item.round_sign_template.name=Modèle de panneau de signalisation rond item.square_sign_template.name=Modèle de panneau de signalisation rectangulaire item.triangle_sign_template.name=Modèle de panneau de signalisation triangulaire @@ -105,18 +106,35 @@ tile.road_sign_info_16c.name=Détour à droite (Allemand) tile.road_sign_info_16d.name=Détour à gauche (Allemand) tile.road_sign_info_23.name=Réduction du nombre de voies (Anglais) tile.road_sign_info_23b.name=Réduction du nombre de voies (Allemand) +tile.road_sign_info_24.name=Flèche de rabattement +tile.road_sign_info_25a.name=Chevron (virage à gauche) +tile.road_sign_info_25b.name=Chevron (virage à droite) +tile.road_sign_info_26a.name=Sens unique +tile.road_sign_info_26b.name=Deux voies à sens unique +tile.road_sign_info_26c.name=Trois voies à sens unique +tile.road_sign_info_27a.name=Réduction du nombre de voies de deux à un +tile.road_sign_info_27b.name=Réduction du nombre de voies de trois à deux +tile.road_sign_info_27c.name=Réduction du nombre de voies de quatre à trois +tile.road_sign_info_28a.name=Séparation des deux voies de circulation +tile.road_sign_info_28b.name=Séparation de la voie de droite + +tile.road_sign_meta_1.name=Panonceau Rappel +tile.road_sign_meta_2a.name=Panonceau 50 m +tile.road_sign_meta_2b.name=Panonceau 100 m +tile.road_sign_meta_2c.name=Panonceau 150 m +tile.road_sign_meta_2d.name=Panonceau 300 m +tile.road_sign_meta_2e.name=Panonceau 500 m + tile.road_town_sign.name=Agglomération tile.road_guardrail.name=Rail de sécurité tile.road_lantern.name=Révèrbère -tile.road_traffic_light.name=Feu tricolore (automatique) +tile.road_traffic_light_auto.name=Feu tricolore (automatique) tile.road_traffic_light_manual.name=Feu tricolore (manuel) -tile.road_traffic_light_red.name=Feu rouge +tile.road_traffic_light_red.name=Feu rouge fixe tile.road_traffic_light_yellow.name=Feu orange fixe -tile.road_traffic_light_yellow_dyn.name=Feu orange (en transition) -tile.road_traffic_light_yellow_blinking.name=Feu orange clignotant -tile.road_traffic_light_green.name=Feu rouge +tile.road_traffic_light_green.name=Feu vert fixe tile.road_pedestrian_traffic_light_manual.name=Feu piétons (manuel) -tile.road_pedestrian_traffic_light.name=Feu piétons (automatique) +tile.road_pedestrian_traffic_light_auto.name=Feu piétons (automatique) tile.road_excl_zone.name=Zebras tile.road_excl_zone_line.name=Zebra (ligne droite) tile.road_excl_zone_corner_in.name=Zebra (coin intérieur) @@ -129,6 +147,7 @@ tile.road_excl_zone_split_out_r.name=(ligne divisée extérieure droite) tile.road_excl_zone_split_out_l.name=(ligne divisée extérieure gauche) tile.road_crosswalk.name=Passage piéton tile.road_sidewalk.name=Trottoir +tile.road_junction_marker.name=Balise d'intersection tile.road_sign_post.name=Support de panneau tile.road_slope.name=Pente tile.road_line_slope.name=Pente (ligne) @@ -145,3 +164,122 @@ gui.sign_printer.warning=Avertissement gui.sign_printer.mandatory=Obligatoire gui.sign_printer.prohibitory=Prohibitif gui.sign_printer.others=Autres + +command.trafficlights.invalidsender=§4Cette commande doit être exécutée par un joueur. +command.trafficlights.invalidhelditem=§4Vous devez exécuter cette commande en tenant une télécommande de feux dans la main. + +command.trafficlights.set.alreadyPending=§4Un ensemble de feux est déjà en cours de création. Vous devez terminer ou annuler cet ensemble pour en créer un nouveau. +command.trafficlights.set.duplicatename=§4Un ensemble de feux portant ce nom existe déjà. +command.trafficlights.set.creating=Création de l'ensemble de feux démarrée. Cliquez avec la télécommande sur un feu pour l'ajouter au groupe actuel. Utilisez §7/trafficlights set save §r pour sauvegarder et §7/trafficlights set cancel §rpour annuler. +command.trafficlights.set.replacing=Reconfiguration de l'ensemble de feux démarrée. Configurez-le comme si vous créiez un nouvel ensemble. §5§lAttention : §r§dL'ensemble %s §dsera supprimé et remplacé par le nouveau quand vous utiliserez §7/trafficlights set save. §dPour annuler, utilisez §7/trafficlights set cancel. +command.trafficlights.set.illegalname=§4Le nom de l'ensemble de feux doit contenir uniqument des caractères alphanumériques et doit commencer par une lettre. +command.trafficlights.set.noname=§4Veuillez définir un nom pour le nouvel ensemble de feux. +command.trafficlights.set.cancelled=La création de l'ensemble de feux a été annulée. +command.trafficlights.set.none=§4Aucun ensemble de feux n'est en cours de création. +command.trafficlights.set.empty=§4L'ensemble de feux doit contenir au moins deux groupe de feux. +command.trafficlights.set.saved=L'ensemble de feux %s a bien été créé et sauvegardé. Les feux devraient être synchronisés dans quelques instants. +command.trafficlights.set.list.empty=Aucun ensemble de feux n'a été créé. +command.trafficlights.set.list=Ensembles de feux créés : %s. +command.trafficlights.set.renamed=L'ensemble de feux %1$s a bien été renommé %2$s +command.trafficlights.set.nosuchset=§4Aucun ensemble de feux portant le nom %s §4n'a été trouvé dans le monde actuel. +command.trafficlights.set.editing=Vous pouvez maintenant éditer l'ensemble de feux %s. Vous pouvez passer d'un groupe à un autre avec §7/trafficlights group select §rpour mettre à jour leurs feux. Utilisez §7/trafficlights set save §r pour sauvegarder et §7/trafficlights set cancel §rpour annuler l'édition. +command.trafficlights.set.deleted=L'ensemble de feux %s a été supprimé et la synchronisation a été interrompue. + +command.trafficlights.group.invalidargs=§4La durée et le délai doivent être des nombres non négatifs. La durée ne doit pas être nulle. +command.trafficlights.group.finished=Groupe terminé. Vous pouvez sélectionner les feux du groupe suivant. +command.trafficlights.group.notfinished=§4Vous devez terminer le groupe actuel avec §7/trafficlights group finish §4avant de terminer l'ensemble ou de sélectionner un autre groupe. +command.trafficlights.group.empty=§4Le groupe actuel est vide. Il doit contenir au moins un feu. +command.trafficlights.group.outofbounds=§4Le numéro entré est en dehors de la plage attendue et ne correspond à aucun groupe. Il doit être compris entre 0 et %s§4. Utilisez 1 pour le premier groupe et ainsi de suite. Si vous ne connaissez pas le nombre exact de groupes, utilisez 0 pour atteindre directement le dernier groupe créé. +command.trafficlights.group.selected=Le groupe %s a été sélectionné. Les feux sélectionnés seront ajoutés à ce groupe jusqu'à ce que vous en sélectionniez un nouveau. +command.trafficlights.group.created=Le nouveau groupe a été ajouté à la fin de la liste et a été sélectionné. Les feux sélectionnés seront ajoutés à ce groupe jusqu'à ce que vous en sélectionniez un nouveau. +command.trafficlights.group.removed=Groupe supprimé. Le dernier groupe de l'ensemble a été sélectionné. +command.trafficlights.group.moved=Le groupe %s a été déplacé à la position %s. Ce groupe est toujours sélectionné. + +command.trafficlights.light.invalidmode=§4Ce feu doit être configuré avec la clé à molette pour recevoir des commandes à distance. +command.trafficlights.light.duplicate=§4Le feu aux coordonnées %1$s %2$s %3$s §4est déjà impliqué dans un autre ensemble de feux. +command.trafficlights.light.added=Le feu aux coordonnées %1$s %2$s %3$s a été ajouté au groupe actuel. +command.trafficlights.light.removed=Le feu aux coordonnées %1$s %2$s %3$s a été retiré du groupe actuel. +command.trafficlights.light.notfound=§4Le groupe actuel ne contient pas de feu aux coordonnées %1$s %2$s %3$s. +command.trafficlights.light.notalight=§4Le block aux coordonnées %1$s %2$s %3$s §4n'est pas un feu tricolore dynamique. + +command.trafficlights.usage=/trafficlights §rAjoutez §7help §rcomme argument de cette commande ou de n'importe quelle sous-commande pour obtenir plus d'informations sur la commande. +command.trafficlights.help=Commande de base pour la gestion des feux tricolores. Ajoutez §7help §rcomme argument de cette commande ou de n'importe quelle sous-commande pour obtenir plus d'informations sur la commande. + +command.trafficlights.set.usage=/trafficlights set +command.trafficlights.set.help=Gestion des ensembles de feux. Les feux d'un même ensemble sont synchronisés. Voir aussi §7/trafficlights group help. + +command.trafficlights.set.cancel.usage=/trafficlights set cancel +command.trafficlights.set.cancel.help=Abandonne la création de l'ensemble de feux (si un ensemble de feux était en cours de création). + +command.trafficlights.set.create.usage=/trafficlights set create +command.trafficlights.set.create.help=Commence la création d'un ensemble de feux. Le nom doit être unique, alphanumérique et doit commencer par une lettre. + +command.trafficlights.set.save.usage=/trafficlights set save +command.trafficlights.set.save.help=Termine l'ensemble de feux en cours de création et démarre la synchronisation. + +command.trafficlights.set.remove.usage=/trafficlights set remove +command.trafficlights.set.remove.help=Supprime l'ensemble de feux portant le nom spécifié. + +command.trafficlights.set.list.usage=/trafficlights set list +command.trafficlights.set.list.help=Obtient la liste des ensembles de feux créés dans ce monde. + +command.trafficlights.set.check.usage=/trafficlights set check +command.trafficlights.set.check.help=Vérifie et affiche des informations sur l'ensemble de feux spécifié. + +command.trafficlights.set.rename.usage=/trafficlights set rename +command.trafficlights.set.rename.help=Renomme un ensemble de feux préexistant par le nouveau nom spécifié. + +command.trafficlights.set.replace.usage=/trafficlights set replace +command.trafficlights.set.replace.help=Reconfigure entièrement l'ensemble de feux indiqué, comme si vous en créiez un nouveau. L'ensemble de feux sera remplacé quand vous utiliserez /trafficlights set save. + +command.trafficlights.set.edit.usage=/trafficlights set edit +command.trafficlights.set.edit.help=Charge l'ensemble de feux spécifié pour permettre sa modification. Les groupes de feux qu'il contient sont automatiquement importés. + +command.trafficlights.group.usage=/trafficlights group +command.trafficlights.group.help=Gestion des groupes de feux dans l'ensemble en cours de création. Quand vous créez un ensemble, le premier groupe de feux est automatiquement ajouté. Les feux du même groupe seront au vert en même temps pendant la durée spécifiée, pendant que les autres seront au rouge. + +command.trafficlights.group.finish.usage=/trafficlights group finish [durée feu orange] +command.trafficlights.group.finish.help=Termine le groupe de feux actuels et en commence un nouveau. La durée correspond à la durée du feu vert, en secondes. Le délai ajoute un délai supplémentaire (en plus de la durée du feu orange) avant que les feux des autres groupes passent au vert. + +command.trafficlights.group.reset.usage=/trafficlights group reset +command.trafficlights.group.reset.help=Supprime tous les feux ajoutés dans le groupe actuel. + +command.trafficlights.group.select.usage=/trafficlights group select +command.trafficlights.group.select.help=Sélectionne le groupe correspondant au numéro spécifié. Les nouveaux feux seront ajoutés dans ce groupe jusqu'à ce qu'un nouveau groupe soit sélectionné. Passer la valeur 0 à l'argument permet de sélectionner le dernier groupe. + +command.trafficlights.group.list.usage=/trafficlights group list +command.trafficlights.group.list.help=Affiche la liste et le détail des groupes appartenant à l'ensemble en cours de création ou d'édition. + +command.trafficlights.group.remove.usage=/trafficlights group remove +command.trafficlights.group.remove.help=Supprime le groupe de feux actuellement sélectionné. Le dernier groupe de l'ensemble est alors sélectionné. + +command.trafficlights.group.add.usage=/trafficlights group add +command.trafficlights.group.add.help=Ajoute et sélectionne un groupe de feux vide à la fin de la liste. Si un groupe de feux vide est déjà présent à la fin de la liste, il est sélectionné sans qu'un nouveau groupe ne soit créé. + +command.trafficlights.group.move.usage=/trafficlights group move +command.trafficlights.group.move.help=Déplace le groupe actuellement sélectionné à la nouvelle position. La position ne doit pas excéder le nombre de groupes. (L'ordre des groupes détermine l'ordre dans lequel les feux passent au vert.) + +command.trafficlights.light.usage=/trafficlights light +command.trafficlights.light.help=Gestion des feux du groupe actuellement sélectionné. + +command.trafficlights.light.add.usage=/trafficlights light add +command.trafficlights.light.add.help=Ajoute le feu aux coordonnées spécifiées au groupe actuel. Le feu ne doit pas déjà être ajouté à un autre groupe ou à un autre ensemble de feux. Cette commande revient à cliquer directement sur le feu avec la télécommande. + +command.trafficlights.light.remove.usage=/trafficlights light remove +command.trafficlights.light.remove.help=Supprime le feu aux coordonnées spécifiées du groupe actuel. + +dfroads.trafficlight.mode.deactivated=Feu désactivé. +dfroads.trafficlight.mode.redstone_controlled=Feu commandé par les impulsions de redstone. +dfroads.trafficlight.mode.command_controlled=Feu commandé à distance. +dfroads.trafficlight.mode.deprecated=§cCe feu est impliqué dans un ensemble de synchronisation à distance. Il ne sera plus synchronisé si vous modifiez son mode de fonctionnement. + +dfroads.partial.ok=OK +dfroads.partial.destroyed=DETRUIT +dfroads.partial.illegalmode=MODE INVALIDE +dfroads.partial.duplicated=EN DOUBLE +dfroads.partial.group=Groupe %s +dfroads.partial.set=Ensemble %s +dfroads.partial.groupprop=(durée=%s secondes, feu orange=%s secondes, délai=%s secondes) : +dfroads.partial.current=(sélectionné) + +dfroads.partial.road_height=(taille %s) \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/_road_slope.json b/src/main/resources/assets/df-roads/models/block/_road_slope.json deleted file mode 100644 index cdd65db..0000000 --- a/src/main/resources/assets/df-roads/models/block/_road_slope.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "df-roads:blocks/road", - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_slope_right", - "2": "df-roads:blocks/road_slope_left", - "top": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 16.0, 13.0, 0.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 0.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 16.0, -3.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 10.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 16.0, -3.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, -74.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -2.100000001490116, -4.600000008940697 ], - "to": [ 16.0, -2.100000001490116, 18.100000001490116 ], - "rotation": { "origin": [ 8.0, 0.0, 16.0 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road.json b/src/main/resources/assets/df-roads/models/block/road.json deleted file mode 100644 index a7390de..0000000 --- a/src/main/resources/assets/df-roads/models/block/road.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "top": "df-roads:blocks/road", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "up": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_excl_zone.json b/src/main/resources/assets/df-roads/models/block/road_excl_zone.json deleted file mode 100644 index 8f4e19a..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_excl_zone.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road", - "excl": "df-roads:blocks/road_excl_zone", - "top": "df-roads:blocks/road", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, 0, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "east": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "south": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "west": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "up": { "texture": "#excl", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#excl", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 12, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "east": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "south": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "west": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "up": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_excl_zone_slope.json b/src/main/resources/assets/df-roads/models/block/road_excl_zone_slope.json deleted file mode 100644 index d4dd881..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_excl_zone_slope.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "df-roads:blocks/road", - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_slope_right", - "2": "df-roads:blocks/road_slope_left", - "excl": "df-roads:blocks/road_excl_zone", - "top": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, -4.0, 0.0 ], - "to": [ 16.0, 12.0, 0.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -4.0, 0.0 ], - "to": [ 0.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 16.0, -4.0, 0.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 10.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -4.0, 0.0 ], - "to": [ 16.0, -4.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, -74.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.100000001490116, -4.600000008940697 ], - "to": [ 16.0, -3.100000001490116, 18.100000001490116 ], - "rotation": { "origin": [ 8.0, -1.0, 16.0 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#excl", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#excl", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Overlay", - "from": [ 0.0, -3.100000001490116, -4.600000008940697 ], - "to": [ 16.0, -3.100000001490116, 18.100000001490116 ], - "rotation": { "origin": [ 8.0, -1.0, 16.0 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_excl_zone_slope_yellow.json b/src/main/resources/assets/df-roads/models/block/road_excl_zone_slope_yellow.json deleted file mode 100644 index b2ae0c1..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_excl_zone_slope_yellow.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "df-roads:blocks/road", - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_slope_right", - "2": "df-roads:blocks/road_slope_left", - "excl": "df-roads:blocks/road_excl_zone_yellow", - "top": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, -4.0, 0.0 ], - "to": [ 16.0, 12.0, 0.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -4.0, 0.0 ], - "to": [ 0.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 16.0, -4.0, 0.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 10.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -4.0, 0.0 ], - "to": [ 16.0, -4.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, -74.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.100000001490116, -4.600000008940697 ], - "to": [ 16.0, -3.100000001490116, 18.100000001490116 ], - "rotation": { "origin": [ 8.0, -1.0, 16.0 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#excl", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#excl", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Overlay", - "from": [ 0.0, -3.100000001490116, -4.600000008940697 ], - "to": [ 16.0, -3.100000001490116, 18.100000001490116 ], - "rotation": { "origin": [ 8.0, -1.0, 16.0 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_excl_zone_yellow.json b/src/main/resources/assets/df-roads/models/block/road_excl_zone_yellow.json deleted file mode 100644 index 9910a58..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_excl_zone_yellow.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road", - "excl": "df-roads:blocks/road_excl_zone_yellow", - "top": "df-roads:blocks/road", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, 0, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "east": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "south": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "west": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "up": { "texture": "#excl", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#excl", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 12, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "east": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "south": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "west": { "texture": "#0", "uv": [ 0, 0, 16, 13 ] }, - "up": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_junction_marker.json b/src/main/resources/assets/df-roads/models/block/road_junction_marker.json new file mode 100644 index 0000000..eb340ac --- /dev/null +++ b/src/main/resources/assets/df-roads/models/block/road_junction_marker.json @@ -0,0 +1,688 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", + "textures": { + "red": "df-roads:blocks/red", + "white": "df-roads:blocks/white", + "metal": "df-roads:blocks/metal", + "particle": "df-roads:blocks/metal" + }, + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "translation": [ + 0, + 0, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "rotation": [ + 0, + 0, + 0 + ], + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "translation": [ + 0, + 0, + 0 + ], + "scale": [ + 1, + 1, + 1 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "translation": [ + 0, + 0, + 0 + ], + "scale": [ + 1, + 1, + 1 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + }, + "elements": [ + { + "name": "Cube", + "from": [ + 6, + 0, + 6 + ], + "to": [ + 10, + 16.53, + 10 + ], + "faces": { + "north": { + "texture": "#white", + "uv": [ + 0, + 0, + 4, + 16 + ] + }, + "east": { + "texture": "#white", + "uv": [ + 0, + 0, + 4, + 16 + ] + }, + "south": { + "texture": "#white", + "uv": [ + 0, + 0, + 4, + 16 + ] + }, + "west": { + "texture": "#white", + "uv": [ + 0, + 0, + 4, + 16 + ] + }, + "down": { + "texture": "#white", + "uv": [ + 0, + 0, + 4, + 4 + ] + } + } + }, + { + "name": "Cube", + "from": [ + 6, + 16.53, + 6 + ], + "to": [ + 10, + 17.03, + 10 + ], + "faces": { + "north": { + "texture": "#metal", + "uv": [ + 0, + 0, + 4, + 0.5 + ] + }, + "east": { + "texture": "#metal", + "uv": [ + 0, + 0, + 4, + 0.5 + ] + }, + "south": { + "texture": "#metal", + "uv": [ + 0, + 0, + 4, + 0.5 + ] + }, + "west": { + "texture": "#metal", + "uv": [ + 0, + 0, + 4, + 0.5 + ] + } + } + }, + { + "name": "Cube", + "from": [ + 6, + 17.03, + 6 + ], + "to": [ + 10, + 21.53, + 10 + ], + "faces": { + "north": { + "texture": "#white", + "uv": [ + 0, + 0, + 4, + 4.5 + ] + }, + "east": { + "texture": "#white", + "uv": [ + 0, + 0, + 4, + 4.5 + ] + }, + "south": { + "texture": "#white", + "uv": [ + 0, + 0, + 4, + 4.5 + ] + }, + "west": { + "texture": "#white", + "uv": [ + 0, + 0, + 4, + 4.5 + ] + } + } + }, + { + "name": "Cube", + "from": [ + 6, + 22.03, + 6 + ], + "to": [ + 10, + 26.28, + 10 + ], + "faces": { + "north": { + "texture": "#red", + "uv": [ + 0, + 0, + 4, + 4.25 + ] + }, + "east": { + "texture": "#red", + "uv": [ + 0, + 0, + 4, + 4.25 + ] + }, + "south": { + "texture": "#red", + "uv": [ + 0, + 0, + 4, + 4.25 + ] + }, + "west": { + "texture": "#red", + "uv": [ + 0, + 0, + 4, + 4.25 + ] + }, + "up": { + "texture": "#red", + "uv": [ + 0, + 0, + 4, + 4 + ] + } + } + }, + { + "name": "Cube", + "from": [ + 6, + 21.53, + 6 + ], + "to": [ + 10, + 22.03, + 10 + ], + "faces": { + "north": { + "texture": "#metal", + "uv": [ + 0, + 0, + 4, + 0.5 + ] + }, + "east": { + "texture": "#metal", + "uv": [ + 0, + 0, + 4, + 0.5 + ] + }, + "south": { + "texture": "#metal", + "uv": [ + 0, + 0, + 4, + 0.5 + ] + }, + "west": { + "texture": "#metal", + "uv": [ + 0, + 0, + 4, + 0.5 + ] + } + } + }, + { + "name": "Cube", + "from": [ + 6.25, + 26.08, + 6.25 + ], + "to": [ + 9.75, + 26.58, + 9.75 + ], + "faces": { + "north": { + "texture": "#red", + "uv": [ + 0, + 0, + 3.5, + 0.5 + ] + }, + "east": { + "texture": "#red", + "uv": [ + 0, + 0, + 3.5, + 0.5 + ] + }, + "south": { + "texture": "#red", + "uv": [ + 0, + 0, + 3.5, + 0.5 + ] + }, + "west": { + "texture": "#red", + "uv": [ + 0, + 0, + 3.5, + 0.5 + ] + }, + "up": { + "texture": "#red", + "uv": [ + 0, + 0, + 3.5, + 3.5 + ] + } + } + }, + { + "name": "Cube", + "from": [ + 6.5, + 26.58, + 6.5 + ], + "to": [ + 9.5, + 27.08, + 9.5 + ], + "faces": { + "north": { + "texture": "#red", + "uv": [ + 0, + 0, + 3, + 0.5 + ] + }, + "east": { + "texture": "#red", + "uv": [ + 0, + 0, + 3, + 0.5 + ] + }, + "south": { + "texture": "#red", + "uv": [ + 0, + 0, + 3, + 0.5 + ] + }, + "west": { + "texture": "#red", + "uv": [ + 0, + 0, + 3, + 0.5 + ] + }, + "up": { + "texture": "#red", + "uv": [ + 0, + 0, + 3, + 3 + ] + } + } + }, + { + "name": "Cube", + "from": [ + 6.75, + 27.08, + 6.75 + ], + "to": [ + 9.25, + 27.58, + 9.25 + ], + "faces": { + "north": { + "texture": "#red", + "uv": [ + 0, + 0, + 2.5, + 0.5 + ] + }, + "east": { + "texture": "#red", + "uv": [ + 0, + 0, + 2.5, + 0.5 + ] + }, + "south": { + "texture": "#red", + "uv": [ + 0, + 0, + 2.5, + 0.5 + ] + }, + "west": { + "texture": "#red", + "uv": [ + 0, + 0, + 2.5, + 0.5 + ] + }, + "up": { + "texture": "#red", + "uv": [ + 0, + 0, + 2.5, + 2.5 + ] + } + } + }, + { + "name": "Cube", + "from": [ + 7, + 27.58, + 7 + ], + "to": [ + 9, + 28.08, + 9 + ], + "faces": { + "north": { + "texture": "#red", + "uv": [ + 0, + 0, + 2, + 0.5 + ] + }, + "east": { + "texture": "#red", + "uv": [ + 0, + 0, + 2, + 0.5 + ] + }, + "south": { + "texture": "#red", + "uv": [ + 0, + 0, + 2, + 0.5 + ] + }, + "west": { + "texture": "#red", + "uv": [ + 0, + 0, + 2, + 0.5 + ] + }, + "up": { + "texture": "#red", + "uv": [ + 0, + 0, + 2, + 2 + ] + } + } + }, + { + "name": "Cube", + "from": [ + 7.25, + 28.08, + 7.25 + ], + "to": [ + 8.75, + 28.58, + 8.75 + ], + "faces": { + "north": { + "texture": "#red", + "uv": [ + 0, + 0, + 1.5, + 0.5 + ] + }, + "east": { + "texture": "#red", + "uv": [ + 0, + 0, + 1.5, + 0.5 + ] + }, + "south": { + "texture": "#red", + "uv": [ + 0, + 0, + 1.5, + 0.5 + ] + }, + "west": { + "texture": "#red", + "uv": [ + 0, + 0, + 1.5, + 0.5 + ] + }, + "up": { + "texture": "#red", + "uv": [ + 0, + 0, + 1.5, + 1.5 + ] + } + } + } + ] +} diff --git a/src/main/resources/assets/df-roads/models/block/road_line_base.json b/src/main/resources/assets/df-roads/models/block/road_line_base.json deleted file mode 100644 index 397f662..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_base.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_white", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Base", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 11.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Mid", - "from": [ 6.0, 11.0, 6.0 ], - "to": [ 10.0, 12.0, 10.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] } - } - }, - { - "name": "Corner", - "from": [ 0.0, 11.0, 0.0 ], - "to": [ 6.0, 12.0, 6.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "Corner", - "from": [ 10.0, 11.0, 0.0 ], - "to": [ 16.0, 12.0, 6.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "Corner", - "from": [ 10.0, 11.0, 10.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "Corner", - "from": [ 0.0, 11.0, 10.0 ], - "to": [ 6.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_line_base_yellow.json b/src/main/resources/assets/df-roads/models/block/road_line_base_yellow.json deleted file mode 100644 index d55f72d..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_base_yellow.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_yellow", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Base", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 11.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Mid", - "from": [ 6.0, 11.0, 6.0 ], - "to": [ 10.0, 12.0, 10.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] } - } - }, - { - "name": "Corner", - "from": [ 0.0, 11.0, 0.0 ], - "to": [ 6.0, 12.0, 6.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "Corner", - "from": [ 10.0, 11.0, 0.0 ], - "to": [ 16.0, 12.0, 6.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "Corner", - "from": [ 10.0, 11.0, 10.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "Corner", - "from": [ 0.0, 11.0, 10.0 ], - "to": [ 6.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_line_east.json b/src/main/resources/assets/df-roads/models/block/road_line_east.json deleted file mode 100644 index 10a46d1..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_east.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 10, - 11, - 6 - ], - "to": [ - 16, - 12, - 10 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_line_east_white.json b/src/main/resources/assets/df-roads/models/block/road_line_east_white.json deleted file mode 100644 index 83dc2b5..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_east_white.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road_white", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 10, - 11, - 6 - ], - "to": [ - 16, - 12, - 10 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_line_east_yellow.json b/src/main/resources/assets/df-roads/models/block/road_line_east_yellow.json deleted file mode 100644 index fc8c953..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_east_yellow.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road_yellow", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 10, - 11, - 6 - ], - "to": [ - 16, - 12, - 10 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_line_north.json b/src/main/resources/assets/df-roads/models/block/road_line_north.json deleted file mode 100644 index 7a51896..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_north.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 6, - 11, - 0 - ], - "to": [ - 10, - 12, - 6 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_line_north_white.json b/src/main/resources/assets/df-roads/models/block/road_line_north_white.json deleted file mode 100644 index 01b9369..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_north_white.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road_white", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 6, - 11, - 0 - ], - "to": [ - 10, - 12, - 6 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_line_north_yellow.json b/src/main/resources/assets/df-roads/models/block/road_line_north_yellow.json deleted file mode 100644 index 35e8456..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_north_yellow.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road_yellow", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 6, - 11, - 0 - ], - "to": [ - 10, - 12, - 6 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_line_south.json b/src/main/resources/assets/df-roads/models/block/road_line_south.json deleted file mode 100644 index 1e519c8..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_south.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 6, - 11, - 10 - ], - "to": [ - 10, - 12, - 16 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_line_south_white.json b/src/main/resources/assets/df-roads/models/block/road_line_south_white.json deleted file mode 100644 index 7c5206a..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_south_white.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road_white", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 6, - 11, - 10 - ], - "to": [ - 10, - 12, - 16 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_line_south_yellow.json b/src/main/resources/assets/df-roads/models/block/road_line_south_yellow.json deleted file mode 100644 index a8ac0b3..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_south_yellow.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road_yellow", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 6, - 11, - 10 - ], - "to": [ - 10, - 12, - 16 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_line_west.json b/src/main/resources/assets/df-roads/models/block/road_line_west.json deleted file mode 100644 index 8e5cdf8..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_west.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 0, - 11, - 6 - ], - "to": [ - 6, - 12, - 10 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_line_west_white.json b/src/main/resources/assets/df-roads/models/block/road_line_west_white.json deleted file mode 100644 index b50b5cd..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_west_white.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road_white", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 0, - 11, - 6 - ], - "to": [ - 6, - 12, - 10 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_line_west_yellow.json b/src/main/resources/assets/df-roads/models/block/road_line_west_yellow.json deleted file mode 100644 index 4be9788..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_line_west_yellow.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road_yellow", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 0, - 11, - 6 - ], - "to": [ - 6, - 12, - 10 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 1 - ] - }, - "up": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 4, - 4 - ] - } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_manual.json b/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_manual.json deleted file mode 100644 index ceaf68e..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_manual.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "blocks/coal_block", - "0": "blocks/coal_block", - "1": "df-roads:blocks/traffic_light_green_on", - "2": "df-roads:blocks/traffic_light_red_off" - }, - "elements": [ - { - "name": "Cube", - "from": [ 5.0, 3.0, 5.0 ], - "to": [ 11.0, 14.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] } - } - }, - { - "name": "green", - "from": [ 6.0, 4.0, 9.0 ], - "to": [ 10.0, 8.0, 10.200000002980232 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 13.0, 9.0 ], - "to": [ 10.0, 14.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 8.0, 9.0 ], - "to": [ 10.0, 9.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 12.300000004470348, 10.0 ], - "to": [ 6.0, 13.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 12.300000004470348, 10.0 ], - "to": [ 11.0, 13.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 7.300000004470348, 10.0 ], - "to": [ 11.0, 8.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 7.300000004470348, 10.0 ], - "to": [ 6.0, 8.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "yellow", - "from": [ 6.0, 9.0, 9.0 ], - "to": [ 10.0, 13.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 3.0, 9.0 ], - "to": [ 6.0, 14.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 3.0, 9.0 ], - "to": [ 11.0, 14.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 3.0, 9.0 ], - "to": [ 10.0, 4.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_green.json b/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_model.json similarity index 100% rename from src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_green.json rename to src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_model.json diff --git a/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_off.json b/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_off.json deleted file mode 100644 index 77703e6..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_off.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "blocks/coal_block", - "0": "blocks/coal_block", - "1": "df-roads:blocks/traffic_light_green_off", - "2": "df-roads:blocks/traffic_light_red_off" - }, - "elements": [ - { - "name": "Cube", - "from": [ 5.0, 3.0, 5.0 ], - "to": [ 11.0, 14.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] } - } - }, - { - "name": "green", - "from": [ 6.0, 4.0, 9.0 ], - "to": [ 10.0, 8.0, 10.200000002980232 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 13.0, 9.0 ], - "to": [ 10.0, 14.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 8.0, 9.0 ], - "to": [ 10.0, 9.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 12.300000004470348, 10.0 ], - "to": [ 6.0, 13.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 12.300000004470348, 10.0 ], - "to": [ 11.0, 13.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 7.300000004470348, 10.0 ], - "to": [ 11.0, 8.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 7.300000004470348, 10.0 ], - "to": [ 6.0, 8.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "yellow", - "from": [ 6.0, 9.0, 9.0 ], - "to": [ 10.0, 13.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 3.0, 9.0 ], - "to": [ 6.0, 14.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 3.0, 9.0 ], - "to": [ 11.0, 14.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 3.0, 9.0 ], - "to": [ 10.0, 4.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_red.json b/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_red.json deleted file mode 100644 index 5be8ec2..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_pedestrian_traffic_light_red.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "blocks/coal_block", - "0": "blocks/coal_block", - "1": "df-roads:blocks/traffic_light_green_off", - "2": "df-roads:blocks/traffic_light_red_on" - }, - "elements": [ - { - "name": "Cube", - "from": [ 5.0, 3.0, 5.0 ], - "to": [ 11.0, 14.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] } - } - }, - { - "name": "green", - "from": [ 6.0, 4.0, 9.0 ], - "to": [ 10.0, 8.0, 10.200000002980232 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 13.0, 9.0 ], - "to": [ 10.0, 14.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 8.0, 9.0 ], - "to": [ 10.0, 9.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 12.300000004470348, 10.0 ], - "to": [ 6.0, 13.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 12.300000004470348, 10.0 ], - "to": [ 11.0, 13.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 7.300000004470348, 10.0 ], - "to": [ 11.0, 8.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 7.300000004470348, 10.0 ], - "to": [ 6.0, 8.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "yellow", - "from": [ 6.0, 9.0, 9.0 ], - "to": [ 10.0, 13.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 3.0, 9.0 ], - "to": [ 6.0, 14.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 3.0, 9.0 ], - "to": [ 11.0, 14.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 3.0, 9.0 ], - "to": [ 10.0, 4.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_sign.json b/src/main/resources/assets/df-roads/models/block/road_sign.json index 0910afb..ac92884 100644 --- a/src/main/resources/assets/df-roads/models/block/road_sign.json +++ b/src/main/resources/assets/df-roads/models/block/road_sign.json @@ -9,23 +9,24 @@ "elements": [ { "name": "Cube", - "from": [ 1.0, 1.0, 6.9 ], - "to": [ 15.0, 15.0, 6.9 ], + "from": [ 1.0, 1.0, 9.1 ], + "to": [ 15.0, 15.0, 9.1 ], "faces": { - "north": { "texture": "#front", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "north" }, - "south": { "texture": "#back", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "south" } + "north": { "texture": "#back", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "north" }, + "south": { "texture": "#front", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "south" } } }, { "name": "Cube", - "from": [ 7.0, 7.0, 6.899999998509884 ], - "to": [ 9.0, 9.0, 8.999999998509884 ], + "from": [ 7.0, 7.0, 6.99 ], + "to": [ 9.0, 9.0, 9.05 ], "faces": { "east": { "texture": "#2", "uv": [ 0.0, 0.0, 2.1, 2.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, "west": { "texture": "#2", "uv": [ 0.0, 0.0, 2.1, 2.0 ] }, "up": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] } + "down": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] } } } ] diff --git a/src/main/resources/assets/df-roads/models/block/road_sign_1.json b/src/main/resources/assets/df-roads/models/block/road_sign_1.json new file mode 100644 index 0000000..779d38e --- /dev/null +++ b/src/main/resources/assets/df-roads/models/block/road_sign_1.json @@ -0,0 +1,35 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "front": "df-roads:blocks/road_sign_warn_11a", + "back": "df-roads:blocks/road_sign_back_triangle", + "2": "df-roads:blocks/metal", + "particle": "df-roads:blocks/metal" + }, + "elements": [ + { + "name": "Cube", + "from": [ 1.0, 1.0, 9.4 ], + "to": [ 15.0, 15.0, 9.4 ], + "rotation": { "origin": [ 8, 0, 8 ], "axis": "y", "angle":-22.5 }, + "faces": { + "north": { "texture": "#back", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "north" }, + "south": { "texture": "#front", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "south" } + } + }, + { + "name": "Cube", + "from": [ 7.0, 7.0, 7.29 ], + "to": [ 9.0, 9.0, 9.35 ], + "rotation": { "origin": [ 8, 0, 8 ], "axis": "y", "angle":-22.5 }, + "faces": { + "east": { "texture": "#2", "uv": [ 0.0, 0.0, 2.1, 2.0 ] }, + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 0.0, 2.1, 2.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_town_sign.json b/src/main/resources/assets/df-roads/models/block/road_sign_2.json similarity index 51% rename from src/main/resources/assets/df-roads/models/block/road_town_sign.json rename to src/main/resources/assets/df-roads/models/block/road_sign_2.json index 6a84f04..a5505d5 100644 --- a/src/main/resources/assets/df-roads/models/block/road_town_sign.json +++ b/src/main/resources/assets/df-roads/models/block/road_sign_2.json @@ -1,31 +1,34 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "0": "df-roads:blocks/road_town_sign", - "1": "df-roads:blocks/road_town_sign_back", + "front": "df-roads:blocks/road_sign_warn_11a", + "back": "df-roads:blocks/road_sign_back_triangle", "2": "df-roads:blocks/metal", "particle": "df-roads:blocks/metal" }, "elements": [ { "name": "Cube", - "from": [ 1.0, 1.0, 6.9 ], - "to": [ 15.0, 15.0, 6.9 ], + "from": [ 1.0, 1.0, 9.45 ], + "to": [ 15.0, 15.0, 9.45 ], + "rotation": { "origin": [ 8, 0, 8 ], "axis": "y", "angle":-45 }, "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "north" }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "south" } + "north": { "texture": "#back", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "north" }, + "south": { "texture": "#front", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "south" } } }, { "name": "Cube", - "from": [ 7.0, 7.0, 6.899999998509884 ], - "to": [ 9.0, 9.0, 8.999999998509884 ], + "from": [ 7.0, 7.0, 7.34 ], + "to": [ 9.0, 9.0, 9.4 ], + "rotation": { "origin": [ 8, 0, 8 ], "axis": "y", "angle":-45 }, "faces": { "east": { "texture": "#2", "uv": [ 0.0, 0.0, 2.1, 2.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, "west": { "texture": "#2", "uv": [ 0.0, 0.0, 2.1, 2.0 ] }, "up": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] } + "down": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] } } } ] diff --git a/src/main/resources/assets/df-roads/models/block/road_sign_3.json b/src/main/resources/assets/df-roads/models/block/road_sign_3.json new file mode 100644 index 0000000..2ae7cf6 --- /dev/null +++ b/src/main/resources/assets/df-roads/models/block/road_sign_3.json @@ -0,0 +1,35 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "front": "df-roads:blocks/road_sign_warn_11a", + "back": "df-roads:blocks/road_sign_back_triangle", + "2": "df-roads:blocks/metal", + "particle": "df-roads:blocks/metal" + }, + "elements": [ + { + "name": "Cube", + "from": [ 1.0, 1.0, 9.4 ], + "to": [ 15.0, 15.0, 9.4 ], + "rotation": { "origin": [ 8, 0, 8 ], "axis": "y", "angle":22.5 }, + "faces": { + "north": { "texture": "#back", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "north" }, + "south": { "texture": "#front", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "south" } + } + }, + { + "name": "Cube", + "from": [ 7.0, 7.0, 7.29 ], + "to": [ 9.0, 9.0, 9.35], + "rotation": { "origin": [ 8, 0, 8 ], "axis": "y", "angle":22.5 }, + "faces": { + "east": { "texture": "#2", "uv": [ 0.0, 0.0, 2.1, 2.0 ] }, + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 0.0, 2.1, 2.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 0.0, 2.0, 2.1 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_slope.json b/src/main/resources/assets/df-roads/models/block/road_slope.json deleted file mode 100644 index c0eb27d..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_slope.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_slope_right", - "2": "df-roads:blocks/road_slope_left", - "top": "df-roads:blocks/road", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [0, -4, 0], - "to": [16, 12, 0], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 16], "texture": "#-1"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 16], "texture": "#-1"}, - "up": {"uv": [0, 0, 16, 0], "texture": "#-1"}, - "down": {"uv": [0, 0, 16, 0], "texture": "#-1"} - }, - "type": "cube" - }, - { - "name": "Cube", - "from": [0, -4, 0], - "to": [0, 12.000000014901161, 16], - "faces": { - "north": {"uv": [0, 0, 0, 16], "texture": "#-1"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 16], "texture": "#-1"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "up": {"uv": [0, 0, -3, 16], "texture": "#-1"}, - "down": {"uv": [0, 0, -11, 15], "texture": "#-1"} - }, - "type": "cube" - }, - { - "name": "Cube", - "from": [16, -4, 0], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 0, 0, 16], "texture": "#-1"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 16], "texture": "#-1"}, - "west": {"uv": [0, 0, 14, 10], "texture": "#2"}, - "up": {"uv": [0, 0, 0, 16], "texture": "#-1"}, - "down": {"uv": [0, 0, 0, 16], "texture": "#-1"} - }, - "type": "cube" - }, - { - "name": "Cube", - "from": [0, -4, 0], - "to": [16, -4, 16], - "faces": { - "north": {"uv": [0, 0, 15, -74], "texture": "#-1"}, - "east": {"uv": [0, 0, 16, 0], "texture": "#-1"}, - "south": {"uv": [0, 0, 16, 0], "texture": "#-1"}, - "west": {"uv": [0, 0, 16, 0], "texture": "#-1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} - }, - "type": "cube" - }, - { - "name": "Cube", - "from": [0, -4.000000014901161, 0], - "to": [16, -4.000000014901161, 16], - "faces": { - "north": {"uv": [0, 0, 16, 0], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 0], "texture": "#-1"}, - "south": {"uv": [0, 0, 16, 0], "texture": "#-1"}, - "west": {"uv": [0, 0, 14, 0], "texture": "#-1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#-1"} - }, - "rotation": { - "origin": [0, -4.0000000014901165, 16], - "axis": "x", - "angle": 45, - "rescale": true - }, - "type": "cube" - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/block/road_slope_inner.json b/src/main/resources/assets/df-roads/models/block/road_slope_inner.json deleted file mode 100644 index 0357505..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_slope_inner.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "df-roads:blocks/road", - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_slope_right", - "2": "df-roads:blocks/road_slope_left" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 16.0, 13.0, 0.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 0.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 16.0, -3.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 10.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 16.0, -3.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, -74.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -2.100000001490116, -4.600000008940697 ], - "to": [ 16.0, -2.100000001490116, 18.100000001490116 ], - "rotation": { "origin": [ 8.0, 0.0, 16.0 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 22.700000010430813 ] } - } - }, - { - "name": "Cube", - "from": [ -4.4999999985098835, -2.1000000312924385, 0.0 ], - "to": [ 18.200000001490118, -2.1000000312924385, 16.0 ], - "rotation": { "origin": [ 16.0, 0.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 22.700000010430813 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 16.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_slope_outer_east.json b/src/main/resources/assets/df-roads/models/block/road_slope_outer_east.json deleted file mode 100644 index 6cc05d8..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_slope_outer_east.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "df-roads:blocks/road", - "0": "df-roads:blocks/road_slope_left", - "1": "df-roads:blocks/road_slope_right", - "2": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 0.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 16.0, -3.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, -74.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, 9.199999988079071, 2.5999999940395355 ], - "to": [ 16.0, 9.199999988079071, 25.30000000447035 ], - "rotation": { "origin": [ 8.0, 0.0, 16.0 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ], "rotation": 90 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 15.700000010430813 ], "rotation": 180 } - } - }, - { - "name": "Cube", - "from": [ -4.4999999985098835, -2.1000000312924385, 0.0 ], - "to": [ 18.200000001490118, -2.1000000312924385, 16.0 ], - "rotation": { "origin": [ 16.0, 0.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ], "rotation": 270 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430814 ], "rotation": 0 } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 16.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_slope_outer_north.json b/src/main/resources/assets/df-roads/models/block/road_slope_outer_north.json deleted file mode 100644 index cb444cb..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_slope_outer_north.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "df-roads:blocks/road", - "0": "df-roads:blocks/road_slope_left", - "1": "df-roads:blocks/road_slope_right", - "2": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 0.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 16.0, -3.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, -74.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, 9.199999988079071, 2.5999999940395355 ], - "to": [ 16.0, 9.199999988079071, 25.30000000447035 ], - "rotation": { "origin": [ 8.0, 0.0, 16.0 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ], "rotation": 180 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 15.700000010430813 ], "rotation": 90 } - } - }, - { - "name": "Cube", - "from": [ -4.4999999985098835, -2.1000000312924385, 0.0 ], - "to": [ 18.200000001490118, -2.1000000312924385, 16.0 ], - "rotation": { "origin": [ 16.0, 0.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ], "rotation": 0 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430814 ], "rotation": 270 } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 16.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_slope_outer_south.json b/src/main/resources/assets/df-roads/models/block/road_slope_outer_south.json deleted file mode 100644 index 08b7b76..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_slope_outer_south.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "df-roads:blocks/road", - "0": "df-roads:blocks/road_slope_left", - "1": "df-roads:blocks/road_slope_right", - "2": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 0.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 16.0, -3.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, -74.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, 9.199999988079071, 2.5999999940395355 ], - "to": [ 16.0, 9.199999988079071, 25.30000000447035 ], - "rotation": { "origin": [ 8.0, 0.0, 16.0 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ], "rotation": 0 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 15.700000010430813 ], "rotation": 270 } - } - }, - { - "name": "Cube", - "from": [ -4.4999999985098835, -2.1000000312924385, 0.0 ], - "to": [ 18.200000001490118, -2.1000000312924385, 16.0 ], - "rotation": { "origin": [ 16.0, 0.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ], "rotation": 180 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430814 ], "rotation": 90 } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 16.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_slope_outer_west.json b/src/main/resources/assets/df-roads/models/block/road_slope_outer_west.json deleted file mode 100644 index 57cf5a7..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_slope_outer_west.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "df-roads:blocks/road", - "0": "df-roads:blocks/road_slope_left", - "1": "df-roads:blocks/road_slope_right", - "2": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 0.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 0.0 ], - "to": [ 16.0, -3.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, -74.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Cube", - "from": [ 0.0, 9.199999988079071, 2.5999999940395355 ], - "to": [ 16.0, 9.199999988079071, 25.30000000447035 ], - "rotation": { "origin": [ 8.0, 0.0, 16.0 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ], "rotation": 270 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 15.700000010430813 ], "rotation": 0 } - } - }, - { - "name": "Cube", - "from": [ -4.4999999985098835, -2.1000000312924385, 0.0 ], - "to": [ 18.200000001490118, -2.1000000312924385, 16.0 ], - "rotation": { "origin": [ 16.0, 0.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 22.700000010430813, 0.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430803 ], "rotation": 90 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.000000010430814 ], "rotation": 180 } - } - }, - { - "name": "Cube", - "from": [ 0.0, -3.0, 16.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 0.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_traffic_light_green.json b/src/main/resources/assets/df-roads/models/block/road_traffic_light_green.json deleted file mode 100644 index 7618edc..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_traffic_light_green.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "blocks/coal_block", - "0": "blocks/coal_block", - "1": "df-roads:blocks/traffic_light_green_on", - "2": "df-roads:blocks/traffic_light_yellow_off", - "3": "df-roads:blocks/traffic_light_red_off" - }, - "elements": [ - { - "name": "Cube", - "from": [ 5.0, 0.0, 5.0 ], - "to": [ 11.0, 16.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] } - } - }, - { - "name": "green", - "from": [ 6.0, 1.0, 9.0 ], - "to": [ 10.0, 5.0, 10.200000002980232 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 15.0, 9.0 ], - "to": [ 10.0, 16.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 14.300000004470348, 10.0 ], - "to": [ 11.0, 15.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 14.300000004470348, 10.0 ], - "to": [ 6.0, 15.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 10.0, 9.0 ], - "to": [ 10.0, 11.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 5.0, 9.0 ], - "to": [ 10.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 9.300000004470348, 10.0 ], - "to": [ 6.0, 10.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 9.300000004470348, 10.0 ], - "to": [ 11.0, 10.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 4.300000004470348, 10.0 ], - "to": [ 11.0, 5.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 4.300000004470348, 10.0 ], - "to": [ 6.0, 5.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "yellow", - "from": [ 6.0, 6.0, 9.0 ], - "to": [ 10.0, 10.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "red", - "from": [ 6.0, 11.0, 9.0 ], - "to": [ 10.0, 15.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 0.0, 9.0 ], - "to": [ 6.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 0.0, 9.0 ], - "to": [ 11.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 0.0, 9.0 ], - "to": [ 10.0, 1.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_traffic_light.json b/src/main/resources/assets/df-roads/models/block/road_traffic_light_model.json similarity index 100% rename from src/main/resources/assets/df-roads/models/block/road_traffic_light.json rename to src/main/resources/assets/df-roads/models/block/road_traffic_light_model.json diff --git a/src/main/resources/assets/df-roads/models/block/road_traffic_light_red.json b/src/main/resources/assets/df-roads/models/block/road_traffic_light_red.json deleted file mode 100644 index 28e9800..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_traffic_light_red.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "blocks/coal_block", - "0": "blocks/coal_block", - "1": "df-roads:blocks/traffic_light_green_off", - "2": "df-roads:blocks/traffic_light_yellow_off", - "3": "df-roads:blocks/traffic_light_red_on" - }, - "elements": [ - { - "name": "Cube", - "from": [ 5.0, 0.0, 5.0 ], - "to": [ 11.0, 16.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] } - } - }, - { - "name": "green", - "from": [ 6.0, 1.0, 9.0 ], - "to": [ 10.0, 5.0, 10.200000002980232 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 15.0, 9.0 ], - "to": [ 10.0, 16.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 14.300000004470348, 10.0 ], - "to": [ 11.0, 15.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 14.300000004470348, 10.0 ], - "to": [ 6.0, 15.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 10.0, 9.0 ], - "to": [ 10.0, 11.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 5.0, 9.0 ], - "to": [ 10.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 9.300000004470348, 10.0 ], - "to": [ 6.0, 10.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 9.300000004470348, 10.0 ], - "to": [ 11.0, 10.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 4.300000004470348, 10.0 ], - "to": [ 11.0, 5.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 4.300000004470348, 10.0 ], - "to": [ 6.0, 5.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "yellow", - "from": [ 6.0, 6.0, 9.0 ], - "to": [ 10.0, 10.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "red", - "from": [ 6.0, 11.0, 9.0 ], - "to": [ 10.0, 15.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 0.0, 9.0 ], - "to": [ 6.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 0.0, 9.0 ], - "to": [ 11.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 0.0, 9.0 ], - "to": [ 10.0, 1.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_traffic_light_yellow.json b/src/main/resources/assets/df-roads/models/block/road_traffic_light_yellow.json deleted file mode 100644 index 39cdfb4..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_traffic_light_yellow.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "blocks/coal_block", - "0": "blocks/coal_block", - "1": "df-roads:blocks/traffic_light_green_off", - "2": "df-roads:blocks/traffic_light_yellow_on", - "3": "df-roads:blocks/traffic_light_red_off" - }, - "elements": [ - { - "name": "Cube", - "from": [ 5.0, 0.0, 5.0 ], - "to": [ 11.0, 16.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] } - } - }, - { - "name": "green", - "from": [ 6.0, 1.0, 9.0 ], - "to": [ 10.0, 5.0, 10.200000002980232 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 15.0, 9.0 ], - "to": [ 10.0, 16.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 14.300000004470348, 10.0 ], - "to": [ 11.0, 15.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 14.300000004470348, 10.0 ], - "to": [ 6.0, 15.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 10.0, 9.0 ], - "to": [ 10.0, 11.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 5.0, 9.0 ], - "to": [ 10.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 9.300000004470348, 10.0 ], - "to": [ 6.0, 10.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 9.300000004470348, 10.0 ], - "to": [ 11.0, 10.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 4.300000004470348, 10.0 ], - "to": [ 11.0, 5.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 4.300000004470348, 10.0 ], - "to": [ 6.0, 5.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "yellow", - "from": [ 6.0, 6.0, 9.0 ], - "to": [ 10.0, 10.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "red", - "from": [ 6.0, 11.0, 9.0 ], - "to": [ 10.0, 15.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 0.0, 9.0 ], - "to": [ 6.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 0.0, 9.0 ], - "to": [ 11.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 0.0, 9.0 ], - "to": [ 10.0, 1.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_traffic_light_yellow_blinking.json b/src/main/resources/assets/df-roads/models/block/road_traffic_light_yellow_blinking.json deleted file mode 100644 index 70b1b57..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_traffic_light_yellow_blinking.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "blocks/coal_block", - "0": "blocks/coal_block", - "1": "df-roads:blocks/traffic_light_green_off", - "2": "df-roads:blocks/traffic_light_yellow_blinking", - "3": "df-roads:blocks/traffic_light_red_off" - }, - "elements": [ - { - "name": "Cube", - "from": [ 5.0, 0.0, 5.0 ], - "to": [ 11.0, 16.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 4.0 ] } - } - }, - { - "name": "green", - "from": [ 6.0, 1.0, 9.0 ], - "to": [ 10.0, 5.0, 10.200000002980232 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.2000000029802322, 4.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.2000000029802322 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 15.0, 9.0 ], - "to": [ 10.0, 16.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 14.300000004470348, 10.0 ], - "to": [ 11.0, 15.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 14.300000004470348, 10.0 ], - "to": [ 6.0, 15.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 10.0, 9.0 ], - "to": [ 10.0, 11.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 5.0, 9.0 ], - "to": [ 10.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 2.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 9.300000004470348, 10.0 ], - "to": [ 6.0, 10.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 9.300000004470348, 10.0 ], - "to": [ 11.0, 10.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 4.300000004470348, 10.0 ], - "to": [ 11.0, 5.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 4.300000004470348, 10.0 ], - "to": [ 6.0, 5.300000004470348, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "yellow", - "from": [ 6.0, 6.0, 9.0 ], - "to": [ 10.0, 10.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "red", - "from": [ 6.0, 11.0, 9.0 ], - "to": [ 10.0, 15.0, 10.300000004470348 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.3000000044703484, 4.0 ] }, - "up": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 4.0, 1.3000000044703484 ] } - } - }, - { - "name": "Cube", - "from": [ 5.0, 0.0, 9.0 ], - "to": [ 6.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 10.0, 0.0, 9.0 ], - "to": [ 11.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Cube", - "from": [ 6.0, 0.0, 9.0 ], - "to": [ 10.0, 1.0, 10.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/block/road_white.json b/src/main/resources/assets/df-roads/models/block/road_white.json deleted file mode 100644 index 6fb5a58..0000000 --- a/src/main/resources/assets/df-roads/models/block/road_white.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_white", - "particle": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 12, - 16 - ], - "faces": { - "north": { - "texture": "#0", - "uv": [ - 0, - 0, - 16, - 13 - ] - }, - "east": { - "texture": "#0", - "uv": [ - 0, - 0, - 16, - 13 - ] - }, - "south": { - "texture": "#0", - "uv": [ - 0, - 0, - 16, - 13 - ] - }, - "west": { - "texture": "#0", - "uv": [ - 0, - 0, - 16, - 13 - ] - }, - "up": { - "texture": "#1", - "uv": [ - 0, - 0, - 16, - 16 - ] - }, - "down": { - "texture": "#0", - "uv": [ - 0, - 0, - 16, - 16 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/item_traffic_remote.json b/src/main/resources/assets/df-roads/models/item/item_traffic_remote.json new file mode 100644 index 0000000..c059ad9 --- /dev/null +++ b/src/main/resources/assets/df-roads/models/item/item_traffic_remote.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "df-roads:items/item_traffic_remote" + } +} diff --git a/src/main/resources/assets/df-roads/models/item/road.json b/src/main/resources/assets/df-roads/models/item/road.json deleted file mode 100644 index 0baad07..0000000 --- a/src/main/resources/assets/df-roads/models/item/road.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_l.json b/src/main/resources/assets/df-roads/models/item/road_arrow_l.json deleted file mode 100644 index b1d9b71..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_l.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_l" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_l_yellow.json b/src/main/resources/assets/df-roads/models/item/road_arrow_l_yellow.json deleted file mode 100644 index 292e6e4..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_l_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_l_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_r.json b/src/main/resources/assets/df-roads/models/item/road_arrow_r.json deleted file mode 100644 index a908f7f..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_r.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_r" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_r_yellow.json b/src/main/resources/assets/df-roads/models/item/road_arrow_r_yellow.json deleted file mode 100644 index 34e5af6..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_r_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_r_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_rl.json b/src/main/resources/assets/df-roads/models/item/road_arrow_rl.json deleted file mode 100644 index 0a7c5fb..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_rl.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_rl" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_rl_yellow.json b/src/main/resources/assets/df-roads/models/item/road_arrow_rl_yellow.json deleted file mode 100644 index 02438b4..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_rl_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_rl_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_s.json b/src/main/resources/assets/df-roads/models/item/road_arrow_s.json deleted file mode 100644 index c590f60..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_s.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_s" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_s_yellow.json b/src/main/resources/assets/df-roads/models/item/road_arrow_s_yellow.json deleted file mode 100644 index 8147de8..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_s_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_s_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_sl.json b/src/main/resources/assets/df-roads/models/item/road_arrow_sl.json deleted file mode 100644 index 08a8082..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_sl.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_sl" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_sl_yellow.json b/src/main/resources/assets/df-roads/models/item/road_arrow_sl_yellow.json deleted file mode 100644 index 0029867..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_sl_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_sl_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_sr.json b/src/main/resources/assets/df-roads/models/item/road_arrow_sr.json deleted file mode 100644 index 8fb3b63..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_sr.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_sr" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_sr_yellow.json b/src/main/resources/assets/df-roads/models/item/road_arrow_sr_yellow.json deleted file mode 100644 index 3b1ba21..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_sr_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_sr_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_srl.json b/src/main/resources/assets/df-roads/models/item/road_arrow_srl.json deleted file mode 100644 index ef66872..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_srl.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_srl" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_arrow_srl_yellow.json b/src/main/resources/assets/df-roads/models/item/road_arrow_srl_yellow.json deleted file mode 100644 index 3ad31e9..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_arrow_srl_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_arrow_srl_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_crosswalk.json b/src/main/resources/assets/df-roads/models/item/road_crosswalk.json deleted file mode 100644 index 0f0f1eb..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_crosswalk.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_crosswalk" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_crosswalk_yellow.json b/src/main/resources/assets/df-roads/models/item/road_crosswalk_yellow.json deleted file mode 100644 index 1603015..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_crosswalk_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_crosswalk_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone.json deleted file mode 100644 index b93befb..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_in.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_in.json deleted file mode 100644 index 8273593..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_in.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone_corner_in" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_in_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_in_yellow.json deleted file mode 100644 index e5c7018..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_in_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_in_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_out.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_out.json deleted file mode 100644 index a5a7e9a..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_out.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone_corner_out" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_out_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_out_yellow.json deleted file mode 100644 index f376051..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_corner_out_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_corner_out_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_in.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_in.json deleted file mode 100644 index cd85ccd..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_in.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone_diagonal_in" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_in_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_in_yellow.json deleted file mode 100644 index fbd0509..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_in_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_in_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_out.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_out.json deleted file mode 100644 index ce9ad66..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_out.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone_diagonal_out" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_out_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_out_yellow.json deleted file mode 100644 index 44060b8..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_diagonal_out_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_diagonal_out_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_line.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_line.json deleted file mode 100644 index 29ee19c..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_line.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone_line" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_line_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_line_yellow.json deleted file mode 100644 index b9b3097..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_line_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_line_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_l.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_l.json deleted file mode 100644 index e411f1f..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_l.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone_split_in_l" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_l_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_l_yellow.json deleted file mode 100644 index ef7cfba..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_l_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_l_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_r.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_r.json deleted file mode 100644 index 43210da..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_r.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone_split_in_r" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_r_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_r_yellow.json deleted file mode 100644 index 3175987..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_in_r_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_in_r_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_l.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_l.json deleted file mode 100644 index 2e5a143..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_l.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone_split_out_l" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_l_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_l_yellow.json deleted file mode 100644 index f1af772..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_l_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_l_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_r.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_r.json deleted file mode 100644 index 36562b4..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_r.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_excl_zone_split_out_r" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_r_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_r_yellow.json deleted file mode 100644 index 5c0dc1a..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_split_out_r_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_split_out_r_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_excl_zone_yellow.json b/src/main/resources/assets/df-roads/models/item/road_excl_zone_yellow.json deleted file mode 100644 index 8c4c67e..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_excl_zone_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_excl_zone_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line.json b/src/main/resources/assets/df-roads/models/item/road_line.json deleted file mode 100644 index c1a3cdc..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_line_single" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_line_diagonal.json b/src/main/resources/assets/df-roads/models/item/road_line_diagonal.json deleted file mode 100644 index bfc0199..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_diagonal.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_line_diagonal" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_line_diagonal_yellow.json b/src/main/resources/assets/df-roads/models/item/road_line_diagonal_yellow.json deleted file mode 100644 index 76cf5ce..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_diagonal_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_line_diagonal_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_double.json b/src/main/resources/assets/df-roads/models/item/road_line_double.json deleted file mode 100644 index 05076f8..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_double.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_line_double" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_line_double_simple.json b/src/main/resources/assets/df-roads/models/item/road_line_double_simple.json deleted file mode 100644 index bcd01fa..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_double_simple.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_line_double" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_double_simple_yellow.json b/src/main/resources/assets/df-roads/models/item/road_line_double_simple_yellow.json deleted file mode 100644 index a32e376..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_double_simple_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_line_double_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_double_yellow.json b/src/main/resources/assets/df-roads/models/item/road_line_double_yellow.json deleted file mode 100644 index a32e376..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_double_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_line_double_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_half_double.json b/src/main/resources/assets/df-roads/models/item/road_line_half_double.json deleted file mode 100644 index c71f180..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_half_double.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_line_half_double" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_line_half_double_simple.json b/src/main/resources/assets/df-roads/models/item/road_line_half_double_simple.json deleted file mode 100644 index f93af9b..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_half_double_simple.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_line_half_double" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_half_double_simple_yellow.json b/src/main/resources/assets/df-roads/models/item/road_line_half_double_simple_yellow.json deleted file mode 100644 index b3a8e0c..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_half_double_simple_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_line_half_double_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_half_double_yellow.json b/src/main/resources/assets/df-roads/models/item/road_line_half_double_yellow.json deleted file mode 100644 index b3a8e0c..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_half_double_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_line_half_double_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_merge.json b/src/main/resources/assets/df-roads/models/item/road_line_merge.json deleted file mode 100644 index 4b467da..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_merge.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_line_merge" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_line_merge_yellow.json b/src/main/resources/assets/df-roads/models/item/road_line_merge_yellow.json deleted file mode 100644 index c80ea44..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_merge_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_line_merge_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_simple.json b/src/main/resources/assets/df-roads/models/item/road_line_simple.json deleted file mode 100644 index c1a3cdc..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_simple.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_line_single" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_line_simple_yellow.json b/src/main/resources/assets/df-roads/models/item/road_line_simple_yellow.json deleted file mode 100644 index a454e79..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_simple_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_line_single_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_slope.json b/src/main/resources/assets/df-roads/models/item/road_line_slope.json deleted file mode 100644 index 6e348e3..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_slope.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road_slope", - "textures": { - "top": "df-roads:blocks/road_line_single_north" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 0, 38, 0 ], - "translation": [ 1.25, 1.50, 0.00 ], - "scale": [ 0.70, 0.70, 0.52 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_line_split_yellow.json b/src/main/resources/assets/df-roads/models/item/road_line_split_yellow.json deleted file mode 100644 index a1245d1..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_split_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_line_split_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_line_stop.json b/src/main/resources/assets/df-roads/models/item/road_line_stop.json deleted file mode 100644 index 0baad07..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_stop.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_line_yellow.json b/src/main/resources/assets/df-roads/models/item/road_line_yellow.json deleted file mode 100644 index a454e79..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_line_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_line_single_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_pedestrian_traffic_light.json b/src/main/resources/assets/df-roads/models/item/road_pedestrian_traffic_light_auto.json similarity index 100% rename from src/main/resources/assets/df-roads/models/item/road_pedestrian_traffic_light.json rename to src/main/resources/assets/df-roads/models/item/road_pedestrian_traffic_light_auto.json diff --git a/src/main/resources/assets/df-roads/models/item/road_slope.json b/src/main/resources/assets/df-roads/models/item/road_slope.json deleted file mode 100644 index 4c33558..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_slope.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_slope", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 0, 38, 0 ], - "translation": [ 1.25, 1.50, 0.00 ], - "scale": [ 0.70, 0.70, 0.52 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_traffic_light.json b/src/main/resources/assets/df-roads/models/item/road_traffic_light.json deleted file mode 100644 index 6d27302..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_traffic_light.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_traffic_light_1", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 180, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.80, 0.80, 0.80 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_traffic_light_green.json b/src/main/resources/assets/df-roads/models/item/road_traffic_light_green.json deleted file mode 100644 index ddaaabc..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_traffic_light_green.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_traffic_light_green", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 180, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.80, 0.80, 0.80 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_traffic_light_green_dyn.json b/src/main/resources/assets/df-roads/models/item/road_traffic_light_green_dyn.json deleted file mode 100644 index ddaaabc..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_traffic_light_green_dyn.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_traffic_light_green", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 180, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.80, 0.80, 0.80 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_traffic_light_manual.json b/src/main/resources/assets/df-roads/models/item/road_traffic_light_manual.json deleted file mode 100644 index 8327753..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_traffic_light_manual.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_traffic_light", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 180, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.80, 0.80, 0.80 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_traffic_light_red.json b/src/main/resources/assets/df-roads/models/item/road_traffic_light_red.json deleted file mode 100644 index a3bc9c0..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_traffic_light_red.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_traffic_light_red", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 180, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.80, 0.80, 0.80 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_traffic_light_red_dyn.json b/src/main/resources/assets/df-roads/models/item/road_traffic_light_red_dyn.json deleted file mode 100644 index a3bc9c0..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_traffic_light_red_dyn.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_traffic_light_red", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 180, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.80, 0.80, 0.80 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_traffic_light_yellow.json b/src/main/resources/assets/df-roads/models/item/road_traffic_light_yellow.json deleted file mode 100644 index e8816f5..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_traffic_light_yellow.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_traffic_light_yellow", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 180, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.80, 0.80, 0.80 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_traffic_light_yellow_blinking.json b/src/main/resources/assets/df-roads/models/item/road_traffic_light_yellow_blinking.json deleted file mode 100644 index 71836b5..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_traffic_light_yellow_blinking.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_traffic_light_yellow_blinking", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 180, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.80, 0.80, 0.80 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_traffic_light_yellow_dyn.json b/src/main/resources/assets/df-roads/models/item/road_traffic_light_yellow_dyn.json deleted file mode 100644 index e8816f5..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_traffic_light_yellow_dyn.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parent": "df-roads:block/road_traffic_light_yellow", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ 180, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.80, 0.80, 0.80 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_white.json b/src/main/resources/assets/df-roads/models/item/road_white.json deleted file mode 100644 index f33206d..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_white.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_white" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_white_half.json b/src/main/resources/assets/df-roads/models/item/road_white_half.json deleted file mode 100644 index 3312079..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_white_half.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_white_half" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_white_half_yellow.json b/src/main/resources/assets/df-roads/models/item/road_white_half_yellow.json deleted file mode 100644 index 536132f..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_white_half_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_white_half_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_white_quarter.json b/src/main/resources/assets/df-roads/models/item/road_white_quarter.json deleted file mode 100644 index aafa1fb..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_white_quarter.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "df-roads:blocks/road", - "1": "df-roads:blocks/road_white_quarter" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 13.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/models/item/road_white_quarter_yellow.json b/src/main/resources/assets/df-roads/models/item/road_white_quarter_yellow.json deleted file mode 100644 index bed1163..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_white_quarter_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_white_quarter_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/models/item/road_yellow.json b/src/main/resources/assets/df-roads/models/item/road_yellow.json deleted file mode 100644 index 9750483..0000000 --- a/src/main/resources/assets/df-roads/models/item/road_yellow.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "df-roads:block/road", - "textures": { - "top": "df-roads:blocks/road_yellow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, -3.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, -2.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 24, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.50, 0.50, 0.50 ] - }, - "gui": { - "rotation": [ -150, 135, 180 ], - "translation": [ -0.00, 0.00, 0.00 ], - "scale": [ 0.62, 0.62, 0.63 ] - }, - "head": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 1.00, 1.00, 1.00 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.00, 0.00, 0.00 ], - "scale": [ 0.70, 0.70, 0.70 ] - } - } -} diff --git a/src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light.json b/src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light_auto.json similarity index 86% rename from src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light.json rename to src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light_auto.json index a1d47c9..f29c898 100644 --- a/src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light.json +++ b/src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light_auto.json @@ -19,6 +19,6 @@ } }, "result": { - "item": "df-roads:road_pedestrian_traffic_light" + "item": "df-roads:road_pedestrian_traffic_light_auto" } } \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light_manual.json b/src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light_manual.json index 2e016b9..638f211 100644 --- a/src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light_manual.json +++ b/src/main/resources/assets/df-roads/recipes/road_pedestrian_traffic_light_manual.json @@ -7,7 +7,7 @@ ], "key": { "F": { - "item": "df-roads:road_pedestrian_traffic_light" + "item": "df-roads:road_pedestrian_traffic_light_auto" }, "R": { "item": "minecraft:redstone" diff --git a/src/main/resources/assets/df-roads/recipes/road_traffic_light.json b/src/main/resources/assets/df-roads/recipes/road_traffic_light_auto.json similarity index 90% rename from src/main/resources/assets/df-roads/recipes/road_traffic_light.json rename to src/main/resources/assets/df-roads/recipes/road_traffic_light_auto.json index 2db6a37..a59291b 100644 --- a/src/main/resources/assets/df-roads/recipes/road_traffic_light.json +++ b/src/main/resources/assets/df-roads/recipes/road_traffic_light_auto.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "df-roads:road_traffic_light" + "item": "df-roads:road_traffic_light_auto" } } \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/recipes/road_traffic_light_green.json b/src/main/resources/assets/df-roads/recipes/road_traffic_light_green.json deleted file mode 100644 index bb97653..0000000 --- a/src/main/resources/assets/df-roads/recipes/road_traffic_light_green.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "I I", - "I I", - "IGI" - ], - "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "G": { - "item": "minecraft:wool", - "data": 13 - } - }, - "result": { - "item": "df-roads:road_traffic_light_green" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/recipes/road_traffic_light_manual.json b/src/main/resources/assets/df-roads/recipes/road_traffic_light_manual.json index dfba935..ba93ff6 100644 --- a/src/main/resources/assets/df-roads/recipes/road_traffic_light_manual.json +++ b/src/main/resources/assets/df-roads/recipes/road_traffic_light_manual.json @@ -7,7 +7,7 @@ ], "key": { "F": { - "item": "df-roads:road_traffic_light" + "item": "df-roads:road_traffic_light_auto" }, "R": { "item": "minecraft:redstone" diff --git a/src/main/resources/assets/df-roads/recipes/road_traffic_light_red.json b/src/main/resources/assets/df-roads/recipes/road_traffic_light_red.json deleted file mode 100644 index e395d16..0000000 --- a/src/main/resources/assets/df-roads/recipes/road_traffic_light_red.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "IRI", - "I I", - "I I" - ], - "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "R": { - "item": "minecraft:wool", - "data": 14 - } - }, - "result": { - "item": "df-roads:road_traffic_light_red" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/recipes/road_traffic_light_yellow.json b/src/main/resources/assets/df-roads/recipes/road_traffic_light_yellow.json deleted file mode 100644 index be02d43..0000000 --- a/src/main/resources/assets/df-roads/recipes/road_traffic_light_yellow.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "I I", - "IYI", - "I I" - ], - "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "Y": { - "item": "minecraft:wool", - "data": 4 - } - }, - "result": { - "item": "df-roads:road_traffic_light_yellow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/df-roads/textures/blocks/red.png b/src/main/resources/assets/df-roads/textures/blocks/red.png new file mode 100644 index 0000000..ddd5c3b Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/red.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_east.png deleted file mode 100644 index ff02d05..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_east_yellow.png deleted file mode 100644 index 3581504..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_north.png deleted file mode 100644 index 9174fe8..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_north_yellow.png deleted file mode 100644 index af22981..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_south.png deleted file mode 100644 index f90d8fa..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_south_yellow.png deleted file mode 100644 index 5c39b04..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_west.png deleted file mode 100644 index 745b65a..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_west_yellow.png deleted file mode 100644 index ccb4e16..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_l_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_east.png deleted file mode 100644 index 243b4da..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_east_yellow.png deleted file mode 100644 index 004a71d..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_north.png deleted file mode 100644 index e9ce032..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_north_yellow.png deleted file mode 100644 index 84e77c4..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_south.png deleted file mode 100644 index 1419cc2..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_south_yellow.png deleted file mode 100644 index 0511b36..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_west.png deleted file mode 100644 index 82ec162..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_west_yellow.png deleted file mode 100644 index 6f1e28c..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_r_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_east.png deleted file mode 100644 index 0e0aaa1..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_east_yellow.png deleted file mode 100644 index 859a7b0..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_north.png deleted file mode 100644 index 8846f52..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_north_yellow.png deleted file mode 100644 index 4d41582..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_south.png deleted file mode 100644 index 96b3ad3..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_south_yellow.png deleted file mode 100644 index 594ede1..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_west.png deleted file mode 100644 index b5613c2..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_west_yellow.png deleted file mode 100644 index 992d3ad..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_rl_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_east.png deleted file mode 100644 index 333f3ec..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_east_yellow.png deleted file mode 100644 index ed50a8f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_north.png deleted file mode 100644 index 1deaba6..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_north_yellow.png deleted file mode 100644 index ec7524e..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_south.png deleted file mode 100644 index 7660b24..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_south_yellow.png deleted file mode 100644 index 01249af..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_west.png deleted file mode 100644 index f6a026a..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_west_yellow.png deleted file mode 100644 index 061b53e..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_s_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_east.png deleted file mode 100644 index 2159aca..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_east_yellow.png deleted file mode 100644 index 2dd1825..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_north.png deleted file mode 100644 index de2b266..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_north_yellow.png deleted file mode 100644 index 4e558f6..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_south.png deleted file mode 100644 index 5168fdf..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_south_yellow.png deleted file mode 100644 index 09b3591..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_west.png deleted file mode 100644 index 12c561f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_west_yellow.png deleted file mode 100644 index de7f7d6..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sl_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_east.png deleted file mode 100644 index 61461c3..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_east_yellow.png deleted file mode 100644 index a021765..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_north.png deleted file mode 100644 index 253a54f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_north_yellow.png deleted file mode 100644 index f151117..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_south.png deleted file mode 100644 index 12c2475..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_south_yellow.png deleted file mode 100644 index 03a0d3e..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_west.png deleted file mode 100644 index 0e063a6..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_west_yellow.png deleted file mode 100644 index 9c1a8b9..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_sr_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_east.png deleted file mode 100644 index d55c131..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_east_yellow.png deleted file mode 100644 index d513cce..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_north.png deleted file mode 100644 index f321bec..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_north_yellow.png deleted file mode 100644 index fe4080a..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_south.png deleted file mode 100644 index 8388f55..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_south_yellow.png deleted file mode 100644 index 7562fc8..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_west.png deleted file mode 100644 index 8294245..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_west_yellow.png deleted file mode 100644 index 86439b6..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_arrow_srl_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_east.png deleted file mode 100644 index 25cc599..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_east_yellow.png deleted file mode 100644 index dc6d311..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_north.png deleted file mode 100644 index 09f61a3..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_north_yellow.png deleted file mode 100644 index 04452f7..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_south.png deleted file mode 100644 index 548f2cd..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_south_yellow.png deleted file mode 100644 index 6b804af..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_west.png deleted file mode 100644 index df286c2..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_west_yellow.png deleted file mode 100644 index d79a069..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_crosswalk_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_east.png deleted file mode 100644 index 6d54697..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_east_yellow.png deleted file mode 100644 index 963a6c7..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_north.png deleted file mode 100644 index 94608b4..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_north_yellow.png deleted file mode 100644 index 2177fc2..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_south.png deleted file mode 100644 index af89ee1..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_south_yellow.png deleted file mode 100644 index 8e55c4d..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_west.png deleted file mode 100644 index f335d9b..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_west_yellow.png deleted file mode 100644 index c2912f7..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_in_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_east.png deleted file mode 100644 index 08a5f6b..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_east_yellow.png deleted file mode 100644 index f3da5d1..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_north.png deleted file mode 100644 index 7138741..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_north_yellow.png deleted file mode 100644 index 7bc771c..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_south.png deleted file mode 100644 index 2361ee8..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_south_yellow.png deleted file mode 100644 index c153bea..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_west.png deleted file mode 100644 index 37165b6..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_west_yellow.png deleted file mode 100644 index f0d68ee..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_corner_out_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_east.png deleted file mode 100644 index 3a66e93..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_east_yellow.png deleted file mode 100644 index f44c22f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_north.png deleted file mode 100644 index 8b673b2..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_north_yellow.png deleted file mode 100644 index 103efe6..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_south.png deleted file mode 100644 index fbe39f9..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_south_yellow.png deleted file mode 100644 index 7811500..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_west.png deleted file mode 100644 index 6d80560..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_west_yellow.png deleted file mode 100644 index 8d65c2c..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_in_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_east.png deleted file mode 100644 index 98d231f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_east_yellow.png deleted file mode 100644 index 1e1744f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_north.png deleted file mode 100644 index 7af37b9..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_north_yellow.png deleted file mode 100644 index 887c4da..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_south.png deleted file mode 100644 index 6d0e9ee..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_south_yellow.png deleted file mode 100644 index bb91de8..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_west.png deleted file mode 100644 index afc05d4..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_west_yellow.png deleted file mode 100644 index dd9e0d3..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_diagonal_out_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_east.png deleted file mode 100644 index 2a4c4a1..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_east_yellow.png deleted file mode 100644 index 4132970..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_east.png deleted file mode 100644 index 6736c01..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_east_yellow.png deleted file mode 100644 index d816007..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_north.png deleted file mode 100644 index c0a2be8..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_north_yellow.png deleted file mode 100644 index ba04342..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_south.png deleted file mode 100644 index 998a927..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_south_yellow.png deleted file mode 100644 index 6314e7f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_west.png deleted file mode 100644 index 00dfe96..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_west_yellow.png deleted file mode 100644 index 5cf52d9..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_line_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_north.png deleted file mode 100644 index 88ceb87..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_north_yellow.png deleted file mode 100644 index 4a5e7e4..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_south.png deleted file mode 100644 index 88ceb87..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_south_yellow.png deleted file mode 100644 index 4a5e7e4..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_east.png deleted file mode 100644 index c95a8de..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_east_yellow.png deleted file mode 100644 index cc796fd..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_north.png deleted file mode 100644 index eda6b4b..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_north_yellow.png deleted file mode 100644 index 4de3f98..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_south.png deleted file mode 100644 index 5c5e379..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_south_yellow.png deleted file mode 100644 index be5e365..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_west.png deleted file mode 100644 index bfe7483..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_west_yellow.png deleted file mode 100644 index 94c08fa..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_l_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_east.png deleted file mode 100644 index 57f6501..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_east_yellow.png deleted file mode 100644 index a4f2c85..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_north.png deleted file mode 100644 index 20430f0..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_north_yellow.png deleted file mode 100644 index a535105..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_south.png deleted file mode 100644 index a239c7f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_south_yellow.png deleted file mode 100644 index 57b33cf..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_west.png deleted file mode 100644 index 44b1383..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_west_yellow.png deleted file mode 100644 index 8dcb2c1..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_in_r_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_east.png deleted file mode 100644 index 520223a..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_east_yellow.png deleted file mode 100644 index 5fc035f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_north.png deleted file mode 100644 index 45eff62..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_north_yellow.png deleted file mode 100644 index 2c02994..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_south.png deleted file mode 100644 index 0c96d32..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_south_yellow.png deleted file mode 100644 index 12186e9..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_west.png deleted file mode 100644 index 292337d..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_west_yellow.png deleted file mode 100644 index b858fc7..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_l_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_east.png deleted file mode 100644 index a5f7b06..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_east_yellow.png deleted file mode 100644 index b660ab3..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_north.png deleted file mode 100644 index 30f685a..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_north_yellow.png deleted file mode 100644 index a5c93ec..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_south.png deleted file mode 100644 index a78e12b..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_south_yellow.png deleted file mode 100644 index 4dbd23b..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_west.png deleted file mode 100644 index 076d435..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_west_yellow.png deleted file mode 100644 index b63ba2d..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_split_out_r_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_west.png deleted file mode 100644 index 2a4c4a1..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_west_yellow.png deleted file mode 100644 index 4132970..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_excl_zone_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_east.png deleted file mode 100644 index fca5bbf..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_east_yellow.png deleted file mode 100644 index bf8d643..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_north.png deleted file mode 100644 index 50ba1e0..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_north_yellow.png deleted file mode 100644 index 96cd95b..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_south.png deleted file mode 100644 index 3f43055..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_south_yellow.png deleted file mode 100644 index 4e74d56..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_west.png deleted file mode 100644 index 1f5ab3e..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_west_yellow.png deleted file mode 100644 index 430bd0d..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_diagonal_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_double_h.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_double_h.png deleted file mode 100644 index cefaf32..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_double_h.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_double_h_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_double_h_yellow.png deleted file mode 100644 index 00184a5..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_double_h_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_east.png deleted file mode 100644 index 885ed08..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_east_yellow.png deleted file mode 100644 index 64c1a5f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_north.png deleted file mode 100644 index 3694b3b..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_north_yellow.png deleted file mode 100644 index 4267062..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_south.png deleted file mode 100644 index 332051b..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_south_yellow.png deleted file mode 100644 index 9541999..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_west.png deleted file mode 100644 index 49bc2a4..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_west_yellow.png deleted file mode 100644 index 6358146..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_half_double_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_east.png deleted file mode 100644 index 6d0c616..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_east_yellow.png deleted file mode 100644 index 08408e0..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_north.png deleted file mode 100644 index 457aac2..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_north_yellow.png deleted file mode 100644 index 39a95a7..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_south.png deleted file mode 100644 index 92a9197..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_south_yellow.png deleted file mode 100644 index 1d8940e..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_west.png deleted file mode 100644 index 6951fff..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_west_yellow.png deleted file mode 100644 index 5dc07b2..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_merge_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_single_h.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_single_h.png deleted file mode 100644 index 153fbea..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_single_h.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_single_h_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_single_h_yellow.png deleted file mode 100644 index 9a76cff..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_single_h_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_split_east.png deleted file mode 100644 index d06288c..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_split_east_yellow.png deleted file mode 100644 index 4923848..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_split_north.png deleted file mode 100644 index 1300a9a..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_split_north_yellow.png deleted file mode 100644 index f943df9..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_split_south.png deleted file mode 100644 index 664f917..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_split_south_yellow.png deleted file mode 100644 index 426b20d..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_split_west.png deleted file mode 100644 index 8911ed0..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_split_west_yellow.png deleted file mode 100644 index ed6dc53..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_split_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_2.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_2.png deleted file mode 100644 index 2173ce0..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_2.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_2_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_2_yellow.png deleted file mode 100644 index c56995f..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_2_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_3.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_3.png deleted file mode 100644 index d0277ba..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_3.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_3_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_3_yellow.png deleted file mode 100644 index 5680298..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_line_stop_3_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_11.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_11.png index 017e56a..58e78d4 100644 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_11.png and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_11.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_24.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_24.png new file mode 100644 index 0000000..c25d380 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_24.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_25a.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_25a.png new file mode 100644 index 0000000..cfb23ed Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_25a.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_25b.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_25b.png new file mode 100644 index 0000000..41096e0 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_25b.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_26a.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_26a.png new file mode 100644 index 0000000..6d02ede Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_26a.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_26b.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_26b.png new file mode 100644 index 0000000..ff59ecf Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_26b.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_26c.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_26c.png new file mode 100644 index 0000000..5cd1615 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_26c.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_27a.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_27a.png new file mode 100644 index 0000000..accec50 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_27a.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_27b.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_27b.png new file mode 100644 index 0000000..9da3566 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_27b.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_27c.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_27c.png new file mode 100644 index 0000000..bdef98d Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_27c.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_28a.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_28a.png new file mode 100644 index 0000000..310ab0e Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_28a.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_28b.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_28b.png new file mode 100644 index 0000000..52a9149 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_info_28b.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_1.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_1.png new file mode 100644 index 0000000..c8a2668 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_1.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2a.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2a.png new file mode 100644 index 0000000..6875b7b Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2a.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2b.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2b.png new file mode 100644 index 0000000..5193a9e Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2b.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2c.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2c.png new file mode 100644 index 0000000..7cf67a8 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2c.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2d.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2d.png new file mode 100644 index 0000000..cf7c0e3 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2d.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2e.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2e.png new file mode 100644 index 0000000..fd3fc4b Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_2e.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_back.png b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_back.png new file mode 100644 index 0000000..fea6dc8 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/road_sign_meta_back.png differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_half_east.png deleted file mode 100644 index cf5aa5e..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_half_east_yellow.png deleted file mode 100644 index 1570ef5..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_half_north.png deleted file mode 100644 index 8900e73..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_half_north_yellow.png deleted file mode 100644 index e8f6578..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_half_south.png deleted file mode 100644 index 081047a..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_half_south_yellow.png deleted file mode 100644 index 8ba8824..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_half_west.png deleted file mode 100644 index d86a283..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_half_west_yellow.png deleted file mode 100644 index e6a6e92..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_half_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_east.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_east.png deleted file mode 100644 index 96dfc95..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_east.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_east_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_east_yellow.png deleted file mode 100644 index c13856e..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_east_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_north.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_north.png deleted file mode 100644 index dc13c54..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_north.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_north_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_north_yellow.png deleted file mode 100644 index c420653..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_north_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_south.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_south.png deleted file mode 100644 index f5a35dd..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_south.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_south_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_south_yellow.png deleted file mode 100644 index 4427d40..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_south_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_west.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_west.png deleted file mode 100644 index a8f824e..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_west.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_west_yellow.png b/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_west_yellow.png deleted file mode 100644 index 3fbfc02..0000000 Binary files a/src/main/resources/assets/df-roads/textures/blocks/road_white_quarter_west_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/df-roads/textures/blocks/white.png b/src/main/resources/assets/df-roads/textures/blocks/white.png new file mode 100644 index 0000000..a4cebc8 Binary files /dev/null and b/src/main/resources/assets/df-roads/textures/blocks/white.png differ diff --git a/src/main/resources/assets/df-roads/textures/items/item_traffic_remote.png b/src/main/resources/assets/df-roads/textures/items/item_traffic_remote.png index 6d123a8..5cb494c 100644 Binary files a/src/main/resources/assets/df-roads/textures/items/item_traffic_remote.png and b/src/main/resources/assets/df-roads/textures/items/item_traffic_remote.png differ