diff --git a/build.gradle b/build.gradle index 111c8c73..6ffe1773 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'net.minecraftforge.gradle.forge' ext.modversion = "3.0.0-a3" ext.mcversion = "1.12.2" -ext.forgeversion = "14.23.0.2517" +ext.forgeversion = "14.23.1.2555" //spongeSchematicVersion = "1" version = mcversion + "-" + modversion @@ -25,9 +25,9 @@ compileJava { } minecraft { - version = "14.23.0.2517" + version = "14.23.1.2555" runDir = "run" - mappings = "snapshot_20171028" + mappings = "snapshot_20171202" replace '${version}', project.version //replace '${spongeSchematicVersion}', spongeSchematicVersion // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. diff --git a/src/main/java/com/zixiken/dimdoors/DimDoors.java b/src/main/java/com/zixiken/dimdoors/DimDoors.java index bdeb6595..71d44192 100644 --- a/src/main/java/com/zixiken/dimdoors/DimDoors.java +++ b/src/main/java/com/zixiken/dimdoors/DimDoors.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -@Mod(modid = DimDoors.MODID, name = "Dimensional Doors", version = DimDoors.VERSION, dependencies = "required-after:Forge@[12.18.3.2281,)") +@Mod(modid = DimDoors.MODID, name = "Dimensional Doors", version = DimDoors.VERSION, dependencies = "required-after:forge@[14.23.0.2517,)") public class DimDoors { public static final String VERSION = "${version}"; @@ -37,11 +37,11 @@ public class DimDoors { @Mod.Instance(DimDoors.MODID) public static DimDoors instance; - public static CreativeTabs dimDoorsCreativeTab = new CreativeTabs("dimDoorsCreativeTab") { + public static CreativeTabs dimDoorsCreativeTab = new CreativeTabs("dimensional_doors_creative_tab") { @Override @SideOnly(Side.CLIENT) public ItemStack getTabIconItem() { - return new ItemStack(ModItems.itemDimDoor); + return new ItemStack(ModItems.DIMENSIONAL_DOOR); } }; diff --git a/src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java b/src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java index b490c639..5aa48de1 100644 --- a/src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java +++ b/src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java @@ -1,5 +1,6 @@ package com.zixiken.dimdoors.client; +import com.zixiken.dimdoors.server.sound.DDSounds; import com.zixiken.dimdoors.shared.DDProxyCommon; import com.zixiken.dimdoors.shared.ModelManager; import com.zixiken.dimdoors.shared.entities.MobMonolith; @@ -13,6 +14,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; @@ -25,11 +27,13 @@ public class DDProxyClient extends DDProxyCommon { @Override public void onPreInitialization(FMLPreInitializationEvent event) { super.onPreInitialization(event); + MinecraftForge.EVENT_BUS.register(DDSounds.class); ModelManager.registerModelVariants(); ModelManager.addCustomStateMappers(); registerRenderers(); + System.out.println("adsaf"); } @Override diff --git a/src/main/java/com/zixiken/dimdoors/client/RenderDimDoor.java b/src/main/java/com/zixiken/dimdoors/client/RenderDimDoor.java index c0ad37ab..d768d5ad 100644 --- a/src/main/java/com/zixiken/dimdoors/client/RenderDimDoor.java +++ b/src/main/java/com/zixiken/dimdoors/client/RenderDimDoor.java @@ -24,9 +24,9 @@ import static org.lwjgl.opengl.GL11.*; public class RenderDimDoor extends TileEntitySpecialRenderer { private FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(16); - private ResourceLocation warpPath = new ResourceLocation(DimDoors.MODID + ":textures/other/WARP.png"); + private ResourceLocation warpPath = new ResourceLocation(DimDoors.MODID + ":textures/other/warp.png"); private ResourceLocation keyPath = new ResourceLocation(DimDoors.MODID + ":textures/other/keyhole.png"); - private ResourceLocation KeyholeLight = new ResourceLocation(DimDoors.MODID + ":textures/other/keyholeLight.png"); + private ResourceLocation keyholeLight = new ResourceLocation(DimDoors.MODID + ":textures/other/keyhole_light.png"); /** * Renders the dimdoor. @@ -226,7 +226,7 @@ public class RenderDimDoor extends TileEntitySpecialRenderer GL11.glEnable(GL11.GL_BLEND); if (i == 1) { - bindTexture(KeyholeLight); + bindTexture(keyholeLight); GlStateManager.color(1, 1, 1, .7f); GlStateManager.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_DST_COLOR); } else { @@ -257,7 +257,7 @@ public class RenderDimDoor extends TileEntitySpecialRenderer } @Override - public void renderTileEntityAt(TileEntityDimDoor te, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(TileEntityDimDoor te, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { World world = te.getWorld(); BlockPos pos = te.getPos(); ((BlockDimDoorBase) world.getBlockState(pos).getBlock()).updateAttachedTile(world, pos); diff --git a/src/main/java/com/zixiken/dimdoors/client/RenderRift.java b/src/main/java/com/zixiken/dimdoors/client/RenderRift.java index caa8a1d6..cfd638e4 100644 --- a/src/main/java/com/zixiken/dimdoors/client/RenderRift.java +++ b/src/main/java/com/zixiken/dimdoors/client/RenderRift.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; public class RenderRift extends TileEntitySpecialRenderer { - private static final EntityItem ITEM = new EntityItem(Minecraft.getMinecraft().world, 0,0,0, new ItemStack(ModItems.itemStableFabric)); + private static final EntityItem ITEM = new EntityItem(Minecraft.getMinecraft().world, 0,0,0, new ItemStack(ModItems.STABLE_FABRIC)); private static ResourceLocation tesseract_path = new ResourceLocation(DimDoors.MODID + ":textures/other/tesseract.png"); private static Vector4f tesseract[] = { @@ -150,7 +150,7 @@ public class RenderRift extends TileEntitySpecialRenderer { * Renders the rift. */ @Override - public void renderTileEntityAt(TileEntityRift te, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(TileEntityRift te, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { double radian = update(partialTicks) * TrigMath.DEG_TO_RAD; GlStateManager.enableLighting(); diff --git a/src/main/java/com/zixiken/dimdoors/client/RenderTransTrapdoor.java b/src/main/java/com/zixiken/dimdoors/client/RenderTransTrapdoor.java index 96be8b1c..9262d121 100644 --- a/src/main/java/com/zixiken/dimdoors/client/RenderTransTrapdoor.java +++ b/src/main/java/com/zixiken/dimdoors/client/RenderTransTrapdoor.java @@ -26,13 +26,13 @@ import org.lwjgl.opengl.GL11; public class RenderTransTrapdoor extends TileEntitySpecialRenderer { private FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(16); - private ResourceLocation riftPath = new ResourceLocation(DimDoors.MODID + ":textures/other/RIFT.png"); - private ResourceLocation warpPath = new ResourceLocation(DimDoors.MODID + ":textures/other/WARP.png"); + private ResourceLocation riftPath = new ResourceLocation(DimDoors.MODID + ":textures/other/rift.png"); + private ResourceLocation warpPath = new ResourceLocation(DimDoors.MODID + ":textures/other/warp.png"); /** * Renders the dimdoor. */ - public void renderTransTrapdoorTileEntity(TileEntityTransTrapdoor tile, double x, double y, double z, float partialTicks) { + public void renderTransTrapdoorTileEntity(TileEntityTransTrapdoor tile, double x, double y, double z, float partialTicks, float alpha) { GlStateManager.disableLighting(); Random random = new Random(31100L); IBlockState state = tile.getWorld().getBlockState(tile.getPos()); @@ -151,7 +151,7 @@ public class RenderTransTrapdoor extends TileEntitySpecialRenderer event) { + event.getRegistry().registerAll( + CRACK, + CREEPY, + DOOR_LOCKED, + DOOR_LOCK_REMOVED, + KEY_LOCK, + KEY_UNLOCKED, + MONK, + RIFT, + RIFT_CLOSE, + RIFT_DOOR, + RIFT_END, + RIFT_START, + TEARING); + } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/CraftingManager.java b/src/main/java/com/zixiken/dimdoors/shared/CraftingManager.java index 0c287b04..53cd3360 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/CraftingManager.java +++ b/src/main/java/com/zixiken/dimdoors/shared/CraftingManager.java @@ -1,50 +1,85 @@ package com.zixiken.dimdoors.shared; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.blocks.ModBlocks; import com.zixiken.dimdoors.shared.items.ModItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.registries.GameData; public class CraftingManager { + public static ResourceLocation getNameForRecipe(ItemStack output) { + ResourceLocation baseLoc = new ResourceLocation(DimDoors.MODID, output.getItem().getRegistryName().getResourcePath()); + ResourceLocation recipeLoc = baseLoc; + int index = 0; + while (net.minecraft.item.crafting.CraftingManager.REGISTRY.containsKey(recipeLoc)) { + index++; + recipeLoc = new ResourceLocation(DimDoors.MODID, baseLoc.getResourcePath() + "_" + index); + } + DimDoors.log(CraftingManager.class, "Registered recipe " + recipeLoc); + return recipeLoc; + } - public static void registerRecipes() { - GameRegistry.addRecipe(new ItemStack(ModItems.itemStableFabric, 1), - "yxy", 'x', Items.ENDER_PEARL, 'y', ModItems.itemWorldThread); + public static IRecipe makeShapedRecipe(ItemStack output, Object... params) { + ResourceLocation location = getNameForRecipe(output); + CraftingHelper.ShapedPrimer primer = CraftingHelper.parseShaped(params); + ShapedRecipes recipe = new ShapedRecipes(output.getItem().getRegistryName().toString(), primer.width, primer.height, primer.input, output); + recipe.setRegistryName(location); + return recipe; + } - GameRegistry.addRecipe(new ItemStack(ModItems.itemDimDoor, 1), - "yxy", 'x', ModItems.itemStableFabric, 'y', Items.IRON_DOOR); + public static IRecipe makeShapedOreRecipe(ItemStack output, Object... params) { + ResourceLocation location = getNameForRecipe(output); + ShapedOreRecipe recipe = new ShapedOreRecipe(location, output, params); + recipe.setRegistryName(location); + GameData.register_impl(recipe); + return recipe; + } - GameRegistry.addRecipe(new ItemStack(ModItems.itemDimDoorChaos, 1), - "yxy", 'x', Items.ENDER_EYE, 'y', ModItems.itemDimDoor); + @SubscribeEvent + public static void registerRecipes(RegistryEvent.Register event) { + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.STABLE_FABRIC, 1), + "yxy", 'x', Items.ENDER_PEARL, 'y', ModItems.WORLD_THREAD)); - GameRegistry.addRecipe(new ItemStack(ModItems.itemDimDoorWarp, 1), - "yxy", 'x', Items.ENDER_PEARL, 'y', Items.OAK_DOOR); + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.DIMENSIONAL_DOOR, 1), + "yxy", 'x', ModItems.STABLE_FABRIC, 'y', Items.IRON_DOOR)); - GameRegistry.addRecipe(new ItemStack(ModBlocks.blockDimHatch, 1), - "y", "x", "y", 'x', Items.ENDER_PEARL, 'y', Blocks.TRAPDOOR); + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.UNSTABLE_DIMENSIONAL_DOOR, 1), + "yxy", 'x', Items.ENDER_EYE, 'y', ModItems.DIMENSIONAL_DOOR)); - GameRegistry.addRecipe(new ItemStack(ModItems.itemDimDoorGold, 1), - "yxy", 'x', ModItems.itemStableFabric, 'y', ModItems.itemDoorGold); + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WARP_DIMENSIONAL_DOOR, 1), + "yxy", 'x', Items.ENDER_PEARL, 'y', Items.OAK_DOOR)); - GameRegistry.addRecipe(new ItemStack(ModItems.itemDoorGold, 1), - "yy", "yy", "yy", 'y', Items.GOLD_INGOT); + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModBlocks.DIMENSIONAL_TRAPDOOR, 1), + "y", "x", "y", 'x', Items.ENDER_PEARL, 'y', Blocks.TRAPDOOR)); - GameRegistry.addRecipe(new ItemStack(ModItems.itemDimDoorPersonal, 1), - "yxy", 'y', ModItems.itemDoorQuartz, 'x', ModItems.itemStableFabric); + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.GOLD_DIMENSIONAL_DOOR, 1), + "yxy", 'x', ModItems.STABLE_FABRIC, 'y', ModItems.GOLD_DOOR)); - GameRegistry.addRecipe(new ShapedOreRecipe(ModItems.itemDoorQuartz, + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.GOLD_DOOR, 1), + "yy", "yy", "yy", 'y', Items.GOLD_INGOT)); + + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.PERSONAL_DIMENSIONAL_DOOR, 1), + "yxy", 'y', ModItems.QUARTZ_DOOR, 'x', ModItems.STABLE_FABRIC)); + + event.getRegistry().register(makeShapedOreRecipe(new ItemStack(ModItems.QUARTZ_DOOR, 1), "yy", "yy", "yy", 'y', "quartz")); - GameRegistry.addRecipe(new ItemStack(ModItems.itemRiftBlade), - "y", "y", "x", 'y', ModItems.itemStableFabric, 'x', Items.IRON_SWORD); + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_BLADE), + "y", "y", "x", 'y', ModItems.STABLE_FABRIC, 'x', Items.IRON_SWORD)); - GameRegistry.addRecipe(new ItemStack(ModItems.itemRiftBlade), - "y", "y", "x", 'y', ModItems.itemStableFabric, 'x', Items.IRON_SWORD); + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_BLADE), + "y", "y", "x", 'y', ModItems.STABLE_FABRIC, 'x', Items.IRON_SWORD)); - GameRegistry.addRecipe(new ItemStack(ModItems.itemRiftConnectionTool), - " w ", "xyx", "xzx", 'z', Items.DIAMOND_SHOVEL, 'y', ModItems.itemStableFabric, 'x', ModItems.itemWorldThread, 'w', Items.DIAMOND); + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_CONNECTION_TOOL), + " w ", "xyx", "xzx", 'z', Items.DIAMOND_SHOVEL, 'y', ModItems.STABLE_FABRIC, 'x', ModItems.WORLD_THREAD, 'w', Items.DIAMOND)); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/DDConfig.java b/src/main/java/com/zixiken/dimdoors/shared/DDConfig.java index ac271ada..fce66936 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/DDConfig.java +++ b/src/main/java/com/zixiken/dimdoors/shared/DDConfig.java @@ -29,8 +29,8 @@ public class DDConfig { private static int publicPocketSize = 2; private static int baseDimID = 684; private static String[] dungeonSchematicNames = { - "defaultDungeonNormal", - "defaultDungeonNether" + "default_dungeon_normal", + "default_dungeon_nether" }; //@todo set default dungeon names private static int maxDungeonDepth = 8; private static int owCoordinateOffsetBase = 64; @@ -38,8 +38,8 @@ public class DDConfig { private static int[] doorRelativeDepths = new int[]{-1, 0, 1}; private static int[] doorRelativeDepthWeights = new int[]{20, 30, 50}; - private static boolean DangerousLimboMonolithsEnabled = false; - private static boolean MonolithTeleportationEnabled = true; + private static boolean dangerousLimboMonolithsEnabled = false; + private static boolean monolithTeleportationEnabled = true; private static int setConfigIntWithMaxAndMin(Configuration config, String category, String key, int defaultValue, String comment, int minValue, int maxValue) { Property prop = config.get(category, key, defaultValue, @@ -98,13 +98,13 @@ public class DDConfig { //Monoliths config.addCustomCategoryComment("monoliths", "How dangerous are Monoliths"); - prop = config.get("monoliths", "dangerousLimboMonolithsDisabled", DangerousLimboMonolithsEnabled, + prop = config.get("monoliths", "dangerousLimboMonolithsDisabled", dangerousLimboMonolithsEnabled, "Are Monoliths in Limbo Dangerous? [default: false]"); - DangerousLimboMonolithsEnabled = prop.getBoolean(); + dangerousLimboMonolithsEnabled = prop.getBoolean(); - prop = config.get("monoliths", "monolithTeleportationEnabled", MonolithTeleportationEnabled, + prop = config.get("monoliths", "monolithTeleportationEnabled", monolithTeleportationEnabled, "Is Monolith Teleportation enabled? [default: true]"); - MonolithTeleportationEnabled = prop.getBoolean(); + monolithTeleportationEnabled = prop.getBoolean(); //Pocket_Dimensions config.addCustomCategoryComment("pocket_dimension", "The following values determine the maximum sizes of different kinds of pockets. These values will only influence new worlds."); @@ -206,10 +206,10 @@ public class DDConfig { } public static boolean isDangerousLimboMonolithsDisabled() { - return DangerousLimboMonolithsEnabled; + return dangerousLimboMonolithsEnabled; } public static boolean isMonolithTeleportationEnabled() { - return MonolithTeleportationEnabled; + return monolithTeleportationEnabled; } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/DDProxyCommon.java b/src/main/java/com/zixiken/dimdoors/shared/DDProxyCommon.java index 5e8221d3..89409377 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/DDProxyCommon.java +++ b/src/main/java/com/zixiken/dimdoors/shared/DDProxyCommon.java @@ -15,8 +15,8 @@ import com.zixiken.dimdoors.shared.tileentities.TileEntityTransTrapdoor; import com.zixiken.dimdoors.shared.world.DimDoorDimensions; import net.minecraft.block.BlockDoor; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -30,9 +30,11 @@ public abstract class DDProxyCommon implements IDDProxy { @Override public void onPreInitialization(FMLPreInitializationEvent event) { MinecraftForge.EVENT_BUS.register(new DDEventHandler()); + MinecraftForge.EVENT_BUS.register(ModBlocks.class); + MinecraftForge.EVENT_BUS.register(ModItems.class); + MinecraftForge.EVENT_BUS.register(CraftingManager.class); + DimDoorDimensions.init(); - ModBlocks.registerBlocks(); - ModItems.registerItems(); GameRegistry.registerTileEntity(TileEntityDimDoor.class, "TileEntityDimDoor"); GameRegistry.registerTileEntity(TileEntityRift.class, "TileEntityRift"); @@ -45,10 +47,8 @@ public abstract class DDProxyCommon implements IDDProxy { @Override public void onInitialization(FMLInitializationEvent event) { - EntityRegistry.registerModEntity(MobMonolith.class, "Monolith", 0, DimDoors.instance, 70, 1, true); - EntityRegistry.registerEgg(MobMonolith.class, 0, 0xffffff); - - CraftingManager.registerRecipes(); + EntityRegistry.registerModEntity(new ResourceLocation(DimDoors.MODID, "mob_monolith"), MobMonolith.class, "monolith", 0, DimDoors.instance, 70, 1, true); + EntityRegistry.registerEgg(new ResourceLocation(DimDoors.MODID, "mob_monolith"), 0, 0xffffff); } public void updateDoorTE(BlockDimDoorBase door, World world, BlockPos pos) { @@ -58,7 +58,7 @@ public abstract class DDProxyCommon implements IDDProxy { IBlockState state = world.getBlockState(pos.down()); dimTile.orientation = state.getBlock() instanceof BlockDimDoorBase ? state.getValue(BlockDoor.FACING).getOpposite() - : ModBlocks.blockDimDoor.getDefaultState().getValue(BlockDoor.FACING); + : ModBlocks.DIMENSIONAL_DOOR.getDefaultState().getValue(BlockDoor.FACING); dimTile.doorIsOpen = door.isDoorOnRift(world, pos) && door.isUpperDoorBlock(world.getBlockState(pos)); dimTile.lockStatus = 0; //@todo dimTile.markDirty(); diff --git a/src/main/java/com/zixiken/dimdoors/shared/ModelManager.java b/src/main/java/com/zixiken/dimdoors/shared/ModelManager.java index a1464a27..49f0ec0b 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/ModelManager.java +++ b/src/main/java/com/zixiken/dimdoors/shared/ModelManager.java @@ -18,36 +18,36 @@ public class ModelManager { public static void registerModels() { //ItemBlock registration - register(getItemFromBlock(ModBlocks.blockFabric), 0, "Reality"); - register(getItemFromBlock(ModBlocks.blockFabric), 1, "Ancient"); - register(getItemFromBlock(ModBlocks.blockFabric), 2, "Altered"); - register(getItemFromBlock(ModBlocks.blockFabric), 3, "Unraveled"); - register(getItemFromBlock(ModBlocks.blockFabric), 4, "Eternal"); + register(getItemFromBlock(ModBlocks.FABRIC), 0, "reality"); + register(getItemFromBlock(ModBlocks.FABRIC), 1, "ancient"); + register(getItemFromBlock(ModBlocks.FABRIC), 2, "altered"); + register(getItemFromBlock(ModBlocks.FABRIC), 3, "unraveled"); + register(getItemFromBlock(ModBlocks.FABRIC), 4, "eternal"); - register(getItemFromBlock(ModBlocks.blockRift)); - register(getItemFromBlock(ModBlocks.blockDimHatch)); + register(getItemFromBlock(ModBlocks.RIFT)); + register(getItemFromBlock(ModBlocks.DIMENSIONAL_TRAPDOOR)); //Item registration - register(ModItems.itemDimDoor); - register(ModItems.itemDimDoorGold); - register(ModItems.itemDoorGold); - register(ModItems.itemDimDoorPersonal); - register(ModItems.itemDoorQuartz); - register(ModItems.itemStableFabric); - register(ModItems.itemDimDoorChaos); - register(ModItems.itemDimDoorWarp); - register(ModItems.itemWorldThread); - register(ModItems.itemRiftConnectionTool); - register(ModItems.itemRiftBlade); + register(ModItems.DIMENSIONAL_DOOR); + register(ModItems.GOLD_DIMENSIONAL_DOOR); + register(ModItems.GOLD_DOOR); + register(ModItems.PERSONAL_DIMENSIONAL_DOOR); + register(ModItems.QUARTZ_DOOR); + register(ModItems.STABLE_FABRIC); + register(ModItems.UNSTABLE_DIMENSIONAL_DOOR); + register(ModItems.WARP_DIMENSIONAL_DOOR); + register(ModItems.WORLD_THREAD); + register(ModItems.RIFT_CONNECTION_TOOL); + register(ModItems.RIFT_BLADE); } public static void registerModelVariants() { - ModelBakery.registerItemVariants(getItemFromBlock(ModBlocks.blockFabric), - new ResourceLocation(ModBlocks.blockFabric.getRegistryName() + "Reality"), - new ResourceLocation(ModBlocks.blockFabric.getRegistryName() + "Ancient"), - new ResourceLocation(ModBlocks.blockFabric.getRegistryName() + "Altered"), - new ResourceLocation(ModBlocks.blockFabric.getRegistryName() + "Unraveled"), - new ResourceLocation(ModBlocks.blockFabric.getRegistryName() + "Eternal")); + ModelBakery.registerItemVariants(getItemFromBlock(ModBlocks.FABRIC), + new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_reality"), + new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_ancient"), + new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_altered"), + new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_unraveled"), + new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_eternal")); } private static void register(Item item) { @@ -57,22 +57,22 @@ public class ModelManager { private static void register(Item item, int meta, String name) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, meta, - new ModelResourceLocation(item.getRegistryName() + name, "inventory")); + new ModelResourceLocation(item.getRegistryName() + "_" + name, "inventory")); } @SuppressWarnings("LocalVariableDeclarationSideOnly") public static void addCustomStateMappers() { StateMap map = new StateMap.Builder().ignore(BlockDoor.POWERED).build(); - ModelLoader.setCustomStateMapper(ModBlocks.blockDoorGold, map); - ModelLoader.setCustomStateMapper(ModBlocks.blockDoorQuartz, map); - ModelLoader.setCustomStateMapper(ModBlocks.blockDimDoorGold, map); - ModelLoader.setCustomStateMapper(ModBlocks.blockDimDoor, map); - ModelLoader.setCustomStateMapper(ModBlocks.blockDimDoorPersonal, map); - ModelLoader.setCustomStateMapper(ModBlocks.blockDimDoorChaos, map); - ModelLoader.setCustomStateMapper(ModBlocks.blockDimDoorWarp, map); + ModelLoader.setCustomStateMapper(ModBlocks.GOLD_DOOR, map); + ModelLoader.setCustomStateMapper(ModBlocks.QUARTZ_DOOR, map); + ModelLoader.setCustomStateMapper(ModBlocks.GOLD_DIMENSIONAL_DOOR, map); + ModelLoader.setCustomStateMapper(ModBlocks.DIMENSIONAL_DOOR, map); + ModelLoader.setCustomStateMapper(ModBlocks.PERSONAL_DIMENSIONAL_DOOR, map); + ModelLoader.setCustomStateMapper(ModBlocks.UNSTABLE_DIMENSIONAL_DOOR, map); + ModelLoader.setCustomStateMapper(ModBlocks.WARP_DIMENSIONAL_DOOR, map); - ModelLoader.setCustomStateMapper(ModBlocks.blockDimDoorTransient, new StateMap.Builder().ignore( + ModelLoader.setCustomStateMapper(ModBlocks.TRANSIENT_DIMENSIONAL_DOOR, new StateMap.Builder().ignore( BlockDoor.FACING, BlockDoor.HALF, BlockDoor.HINGE, BlockDoor.OPEN, BlockDoor.POWERED).build()); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/SchematicHandler.java b/src/main/java/com/zixiken/dimdoors/shared/SchematicHandler.java index 5f280753..e9de7b2c 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/SchematicHandler.java +++ b/src/main/java/com/zixiken/dimdoors/shared/SchematicHandler.java @@ -75,8 +75,8 @@ public class SchematicHandler { } public void loadSchematics() { - personalPocketTemplate = loadTemplatesFromJson("defaultPrivate", PocketRegistry.INSTANCE.getPrivatePocketSize()).get(0); - publicPocketTemplate = loadTemplatesFromJson("defaultPublic", PocketRegistry.INSTANCE.getPublicPocketSize()).get(0); + personalPocketTemplate = loadTemplatesFromJson("default_private", PocketRegistry.INSTANCE.getPrivatePocketSize()).get(0); + publicPocketTemplate = loadTemplatesFromJson("default_public", PocketRegistry.INSTANCE.getPublicPocketSize()).get(0); dungeonTemplates = new ArrayList(); List dungeonSchematicNameStrings = DDConfig.getDungeonSchematicNames(); int maxPocketSize = PocketRegistry.INSTANCE.getMaxPocketSize(); @@ -92,7 +92,7 @@ public class SchematicHandler { } constructDungeonNameMap(); - //Schematic.TempGenerateDefaultSchematics(); + // Schematic.tempGenerateDefaultSchematics(); } private void constructDungeonNameMap() { diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoor.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoor.java index 2494d7b8..60966a87 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoor.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoor.java @@ -1,23 +1,25 @@ package com.zixiken.dimdoors.shared.blocks; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.items.ModItems; import net.minecraft.block.material.Material; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; public class BlockDimDoor extends BlockDimDoorBase { - public static final String ID = "blockDimDoor"; + public static final String ID = "dimensional_door"; public BlockDimDoor() { super(Material.IRON); setHardness(1.0F); setResistance(2000.0F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override public Item getItemDoor() { - return ModItems.itemDimDoor; + return ModItems.DIMENSIONAL_DOOR; } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorBase.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorBase.java index a3f1344c..2eb32669 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorBase.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorBase.java @@ -6,7 +6,6 @@ import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.RiftRegistry; import com.zixiken.dimdoors.shared.tileentities.DDTileEntityBase; import com.zixiken.dimdoors.shared.tileentities.TileEntityDimDoor; -import javax.annotation.Nullable; import net.minecraft.block.BlockDoor; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -156,7 +155,7 @@ public abstract class BlockDimDoorBase extends BlockDoor implements IDimDoor, IT } super.breakBlock(world, pos, state); if (shouldPlaceRift) { - world.setBlockState(pos, ModBlocks.blockRift.getDefaultState()); + world.setBlockState(pos, ModBlocks.RIFT.getDefaultState()); DDTileEntityBase newRift = (DDTileEntityBase) world.getTileEntity(pos); newRift.loadDataFrom(origRift); //@todo this does not work here, or does it? } @@ -188,7 +187,7 @@ public abstract class BlockDimDoorBase extends BlockDoor implements IDimDoor, IT } private boolean canPlaceTopAt(IBlockState state) { - return (state.getBlock() == ModBlocks.blockRift || state.equals(Blocks.AIR) || state.getMaterial().isReplaceable()); + return (state.getBlock() == ModBlocks.RIFT || state.equals(Blocks.AIR) || state.getMaterial().isReplaceable()); } protected int getCloseSound() diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorGold.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorGold.java index f503ba51..420c025d 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorGold.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorGold.java @@ -1,26 +1,28 @@ package com.zixiken.dimdoors.shared.blocks; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.items.ModItems; import com.zixiken.dimdoors.shared.tileentities.TileEntityDimDoorGold; import net.minecraft.block.material.Material; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class BlockDimDoorGold extends BlockDimDoorBase { - public static final String ID = "blockDimDoorGold"; + public static final String ID = "gold_dimensional_door"; public BlockDimDoorGold() { super(Material.IRON); setHardness(1.0F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override public Item getItemDoor() { - return ModItems.itemDimDoorGold; + return ModItems.GOLD_DIMENSIONAL_DOOR; } @Override diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorPersonal.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorPersonal.java index 6be287c6..3c418a63 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorPersonal.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorPersonal.java @@ -1,26 +1,28 @@ package com.zixiken.dimdoors.shared.blocks; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.items.ModItems; import com.zixiken.dimdoors.shared.tileentities.TileEntityDimDoorPersonal; import net.minecraft.block.material.Material; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class BlockDimDoorPersonal extends BlockDimDoorBase { - public static final String ID = "blockDimDoorPersonal"; + public static final String ID = "quartz_dimensional_door"; public BlockDimDoorPersonal() { super(Material.ROCK); setHardness(0.1F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override public Item getItemDoor() { - return ModItems.itemDimDoorPersonal; + return ModItems.PERSONAL_DIMENSIONAL_DOOR; } @Override diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorTransient.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorTransient.java index 0a3847dd..5e61430b 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorTransient.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorTransient.java @@ -1,23 +1,25 @@ package com.zixiken.dimdoors.shared.blocks; +import com.zixiken.dimdoors.DimDoors; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockDimDoorTransient extends BlockDimDoorBase { - public static final String ID = "blockDimDoorTransient"; + public static final String ID = "transient_dimensional_door"; public BlockDimDoorTransient() { super(Material.IRON); setHardness(1.0F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override @@ -28,7 +30,7 @@ public class BlockDimDoorTransient extends BlockDimDoorBase { if (entity instanceof EntityPlayer && isEntityFacingDoor(state, (EntityLivingBase) entity)) { // Turn the door into a rift AFTER teleporting the player. // The door's orientation may be necessary for the teleport. - world.setBlockState(pos, ModBlocks.blockRift.getDefaultState()); + world.setBlockState(pos, ModBlocks.RIFT.getDefaultState()); world.setBlockToAir(pos.down()); } } else { diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorChaos.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorUnstable.java similarity index 70% rename from src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorChaos.java rename to src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorUnstable.java index 26a1a587..aa63f36b 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorChaos.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorUnstable.java @@ -1,5 +1,6 @@ package com.zixiken.dimdoors.shared.blocks; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.items.ModItems; import com.zixiken.dimdoors.shared.tileentities.TileEntityDimDoorChaos; import java.util.Random; @@ -8,23 +9,24 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -public class BlockDimDoorChaos extends BlockDimDoorBase { +public class BlockDimDoorUnstable extends BlockDimDoorBase { - public static final String ID = "blockDimDoorChaos"; + public static final String ID = "unstable_dimensional_door"; - public BlockDimDoorChaos() { + public BlockDimDoorUnstable() { super(Material.IRON); setHardness(.2F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); setLightLevel(.0F); } @Override public Item getItemDoor() { - return ModItems.itemDimDoorChaos; + return ModItems.UNSTABLE_DIMENSIONAL_DOOR; } @Override diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorWarp.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorWarp.java index 8ce88a68..1284f402 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorWarp.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimDoorWarp.java @@ -1,26 +1,28 @@ package com.zixiken.dimdoors.shared.blocks; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.items.ModItems; import com.zixiken.dimdoors.shared.tileentities.TileEntityDimDoorWarp; import net.minecraft.block.material.Material; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class BlockDimDoorWarp extends BlockDimDoorBase { - public static final String ID = "blockDimDoorWarp"; + public static final String ID = "warp_dimensional_door"; public BlockDimDoorWarp() { super(Material.WOOD); setHardness(1.0F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override public Item getItemDoor() { - return ModItems.itemDimDoorWarp; + return ModItems.WARP_DIMENSIONAL_DOOR; } @Override diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDoorGold.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDoorGold.java index dbe01e3f..23707d43 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDoorGold.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDoorGold.java @@ -2,12 +2,14 @@ package com.zixiken.dimdoors.shared.blocks; import java.util.Random; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.items.ModItems; import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -15,23 +17,23 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockDoorGold extends BlockDoor { - public static final String ID = "blockDoorGold"; + public static final String ID = "gold_door"; public BlockDoorGold() { super(Material.IRON); setHardness(0.1F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(BlockDoor.HALF) == EnumDoorHalf.LOWER ? ModItems.itemDoorGold : null; + return state.getValue(BlockDoor.HALF) == EnumDoorHalf.LOWER ? ModItems.GOLD_DOOR : null; } @Override @SideOnly(Side.CLIENT) public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(ModItems.itemDoorGold); + return new ItemStack(ModItems.GOLD_DOOR); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDoorQuartz.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDoorQuartz.java index cd9c1588..6470929b 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDoorQuartz.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDoorQuartz.java @@ -2,12 +2,14 @@ package com.zixiken.dimdoors.shared.blocks; import java.util.Random; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.items.ModItems; import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -15,23 +17,23 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockDoorQuartz extends BlockDoor { - public static final String ID = "blockDoorQuartz"; + public static final String ID = "quartz_door"; public BlockDoorQuartz() { super(Material.ROCK); setHardness(0.1F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return state.getValue(BlockDoor.HALF) == EnumDoorHalf.LOWER ? ModItems.itemDoorQuartz : null; + return state.getValue(BlockDoor.HALF) == EnumDoorHalf.LOWER ? ModItems.QUARTZ_DOOR : null; } @Override @SideOnly(Side.CLIENT) public ItemStack getItem(World world, BlockPos pos, IBlockState state) { - return new ItemStack(ModItems.itemDoorQuartz); + return new ItemStack(ModItems.QUARTZ_DOOR); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockFabric.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockFabric.java index 9ff7af40..e4532285 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockFabric.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockFabric.java @@ -22,10 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.NonNullList; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.Explosion; @@ -38,7 +35,7 @@ import javax.annotation.Nullable; @SuppressWarnings("deprecation") public class BlockFabric extends Block { - public static final String ID = "blockFabric"; + public static final String ID = "fabric"; public static final PropertyEnum TYPE = PropertyEnum.create("type", BlockFabric.EnumType.class); private static final float SUPER_HIGH_HARDNESS = 10000000000000F; @@ -50,8 +47,7 @@ public class BlockFabric extends Block { setLightLevel(1.0F); setHardness(0.1F); setUnlocalizedName(ID); - setRegistryName(ID); - setDefaultState(blockState.getBaseState().withProperty(TYPE, EnumType.REALITY)); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); setSoundType(SoundType.STONE); setTickRandomly(true); diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockRift.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockRift.java index 6a0a2ab6..1bcddd4d 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockRift.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockRift.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -35,7 +36,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockRift extends Block implements ITileEntityProvider { private static final float MIN_IMMUNE_RESISTANCE = 5000.0F; - public static final String ID = "blockRift"; + public static final String ID = "rift"; private final ArrayList blocksImmuneToRift; // List of Vanilla blocks immune to rifts private final ArrayList modBlocksImmuneToRift; // List of DD blocks immune to rifts @@ -45,20 +46,20 @@ public class BlockRift extends Block implements ITileEntityProvider { setTickRandomly(true); setHardness(1.0F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); modBlocksImmuneToRift = new ArrayList(); - modBlocksImmuneToRift.add(ModBlocks.blockFabric); - modBlocksImmuneToRift.add(ModBlocks.blockDimDoor); - modBlocksImmuneToRift.add(ModBlocks.blockDimDoorWarp); - modBlocksImmuneToRift.add(ModBlocks.blockDimHatch); - modBlocksImmuneToRift.add(ModBlocks.blockDimDoorChaos); - modBlocksImmuneToRift.add(ModBlocks.blockRift); - modBlocksImmuneToRift.add(ModBlocks.blockDimDoorTransient); - modBlocksImmuneToRift.add(ModBlocks.blockDimDoorGold); - modBlocksImmuneToRift.add(ModBlocks.blockDoorGold); - modBlocksImmuneToRift.add(ModBlocks.blockDimDoorPersonal); - modBlocksImmuneToRift.add(ModBlocks.blockDoorQuartz); + modBlocksImmuneToRift.add(ModBlocks.FABRIC); + modBlocksImmuneToRift.add(ModBlocks.DIMENSIONAL_DOOR); + modBlocksImmuneToRift.add(ModBlocks.WARP_DIMENSIONAL_DOOR); + modBlocksImmuneToRift.add(ModBlocks.DIMENSIONAL_TRAPDOOR); + modBlocksImmuneToRift.add(ModBlocks.UNSTABLE_DIMENSIONAL_DOOR); + modBlocksImmuneToRift.add(ModBlocks.RIFT); + modBlocksImmuneToRift.add(ModBlocks.TRANSIENT_DIMENSIONAL_DOOR); + modBlocksImmuneToRift.add(ModBlocks.GOLD_DIMENSIONAL_DOOR); + modBlocksImmuneToRift.add(ModBlocks.GOLD_DOOR); + modBlocksImmuneToRift.add(ModBlocks.PERSONAL_DIMENSIONAL_DOOR); + modBlocksImmuneToRift.add(ModBlocks.QUARTZ_DOOR); blocksImmuneToRift = new ArrayList(); blocksImmuneToRift.add(Blocks.LAPIS_BLOCK); @@ -84,7 +85,7 @@ public class BlockRift extends Block implements ITileEntityProvider { } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return null; } @@ -98,12 +99,12 @@ public class BlockRift extends Block implements ITileEntityProvider { } /** - * Returns Returns true if the given side of this block type should be + * Returns true if the given side of this block type should be * rendered (if it's solid or not), if the adjacent block is at the given * coordinates. Args: blockAccess, x, y, z, side */ @Override - public boolean isBlockSolid(IBlockAccess worldIn, BlockPos pos, EnumFacing side) { + public boolean isSideSolid(IBlockState base_state, IBlockAccess worldIn, BlockPos pos, EnumFacing side) { return false; } @@ -116,7 +117,7 @@ public class BlockRift extends Block implements ITileEntityProvider { Block block = world.getBlockState(pos).getBlock(); if (!world.getBlockState(pos).equals(Blocks.AIR) && !(block instanceof BlockLiquid || block instanceof IFluidBlock)) { - ItemStack thread = new ItemStack(ModItems.itemWorldThread, 1); + ItemStack thread = new ItemStack(ModItems.WORLD_THREAD, 1); world.spawnEntity(new EntityItem(world, pos.getX(), pos.getY(), pos.getZ(), thread)); } } @@ -211,7 +212,7 @@ public class BlockRift extends Block implements ITileEntityProvider { } @Override - public boolean causesSuffocation() { + public boolean causesSuffocation(IBlockState state) { return false; } diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockTransTrapdoor.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockTransTrapdoor.java index 90fae08e..232ee580 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockTransTrapdoor.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockTransTrapdoor.java @@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -26,14 +27,14 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockTransTrapdoor extends BlockTrapDoor implements IDimDoor, ITileEntityProvider { - public static final String ID = "blockDimHatch"; + public static final String ID = "dimensional_trapdoor"; public BlockTransTrapdoor() { super(Material.WOOD); this.setCreativeTab(DimDoors.dimDoorsCreativeTab); setHardness(1.0F); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); setSoundType(SoundType.WOOD); } @@ -58,9 +59,9 @@ public class BlockTransTrapdoor extends BlockTrapDoor implements IDimDoor, ITile } @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block neighborBlock) { + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block neighborBlock, BlockPos fromPos) { if (checkCanOpen(worldIn, pos)) { - super.neighborChanged(state, worldIn, pos, neighborBlock); + super.neighborChanged(state, worldIn, pos, neighborBlock, fromPos); } } @@ -93,7 +94,7 @@ public class BlockTransTrapdoor extends BlockTrapDoor implements IDimDoor, ITile @Override public Item getItemDoor() { - return Item.getItemFromBlock(ModBlocks.blockDimHatch); + return Item.getItemFromBlock(ModBlocks.DIMENSIONAL_TRAPDOOR); } public static boolean isTrapdoorSetLow(IBlockState state) { diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/IDimDoor.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/IDimDoor.java index a4db0b3f..2b350880 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/IDimDoor.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/IDimDoor.java @@ -12,9 +12,7 @@ public interface IDimDoor { * player collides with an open door * * @param world - * @param x - * @param y - * @param z + * @param pos * @param entity */ public void enterDimDoor(World world, BlockPos pos, Entity entity); @@ -22,12 +20,10 @@ public interface IDimDoor { public Item getItemDoor(); /** - * checks if any of this doors blocks are overlapping with a rift + * Checks if any of this doors blocks are overlapping with a rift * * @param world - * @param x - * @param y - * @param z + * @param pos * @return */ public boolean isDoorOnRift(World world, BlockPos pos); diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/ModBlocks.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/ModBlocks.java index 5f810f5b..71bec6ac 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/ModBlocks.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/ModBlocks.java @@ -1,32 +1,40 @@ package com.zixiken.dimdoors.shared.blocks; -import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ModBlocks { - public static BlockDoorQuartz blockDoorQuartz; - public static BlockDoorGold blockDoorGold; - public static BlockDimDoorPersonal blockDimDoorPersonal; - public static BlockDimDoorTransient blockDimDoorTransient; - public static BlockDimDoorWarp blockDimDoorWarp; - public static BlockDimDoorGold blockDimDoorGold; - public static BlockDimDoorChaos blockDimDoorChaos; - public static BlockDimDoor blockDimDoor; - public static BlockTransTrapdoor blockDimHatch; - public static BlockFabric blockFabric; - public static BlockRift blockRift; + // Regular doors + public final static BlockDoorGold GOLD_DOOR = new BlockDoorGold(); + public final static BlockDoorQuartz QUARTZ_DOOR = new BlockDoorQuartz(); - public static void registerBlocks() { - GameRegistry.register(blockDoorQuartz = new BlockDoorQuartz()); - GameRegistry.register(blockDimDoorPersonal = new BlockDimDoorPersonal()); - GameRegistry.register(blockDoorGold = new BlockDoorGold()); - GameRegistry.register(blockDimDoorGold = new BlockDimDoorGold()); - GameRegistry.register(blockDimDoorChaos = new BlockDimDoorChaos()); - GameRegistry.register(blockDimDoorWarp = new BlockDimDoorWarp()); - GameRegistry.register(blockDimDoor = new BlockDimDoor()); - GameRegistry.register(blockDimHatch = new BlockTransTrapdoor()); - GameRegistry.register(blockFabric = new BlockFabric()); - GameRegistry.register(blockDimDoorTransient = new BlockDimDoorTransient()); - GameRegistry.register(blockRift = new BlockRift()); + // Dimensional doors + public final static BlockDimDoor DIMENSIONAL_DOOR = new BlockDimDoor(); + public final static BlockDimDoorGold GOLD_DIMENSIONAL_DOOR = new BlockDimDoorGold(); + public final static BlockDimDoorPersonal PERSONAL_DIMENSIONAL_DOOR = new BlockDimDoorPersonal(); + public final static BlockDimDoorUnstable UNSTABLE_DIMENSIONAL_DOOR = new BlockDimDoorUnstable(); + public final static BlockDimDoorTransient TRANSIENT_DIMENSIONAL_DOOR = new BlockDimDoorTransient(); + public final static BlockDimDoorWarp WARP_DIMENSIONAL_DOOR = new BlockDimDoorWarp(); + public final static BlockTransTrapdoor DIMENSIONAL_TRAPDOOR = new BlockTransTrapdoor(); + + // Blocks + public final static BlockFabric FABRIC = new BlockFabric(); + public final static BlockRift RIFT = new BlockRift(); + + @SubscribeEvent + public static void registerBlocks(RegistryEvent.Register event) { + event.getRegistry().register(QUARTZ_DOOR); + event.getRegistry().register(PERSONAL_DIMENSIONAL_DOOR); + event.getRegistry().register(GOLD_DOOR); + event.getRegistry().register(GOLD_DIMENSIONAL_DOOR); + event.getRegistry().register(UNSTABLE_DIMENSIONAL_DOOR); + event.getRegistry().register(WARP_DIMENSIONAL_DOOR); + event.getRegistry().register(DIMENSIONAL_DOOR); + event.getRegistry().register(DIMENSIONAL_TRAPDOOR); + event.getRegistry().register(FABRIC); + event.getRegistry().register(TRANSIENT_DIMENSIONAL_DOOR); + event.getRegistry().register(RIFT); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/entities/RenderMobObelisk.java b/src/main/java/com/zixiken/dimdoors/shared/entities/RenderMobObelisk.java index b594f365..c1ddfbb8 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/entities/RenderMobObelisk.java +++ b/src/main/java/com/zixiken/dimdoors/shared/entities/RenderMobObelisk.java @@ -23,25 +23,25 @@ public class RenderMobObelisk extends RenderLiving { protected ModelMobObelisk obeliskModel; protected static final List monolith_textures = Arrays.asList( - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith0.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith1.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith2.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith3.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith4.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith5.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith6.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith7.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith8.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith9.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith10.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith11.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith12.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith13.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith14.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith15.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith16.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith17.png"), - new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith18.png")); + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith0.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith1.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith2.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith3.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith4.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith5.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith6.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith7.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith8.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith9.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith10.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith11.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith12.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith13.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith14.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith15.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith16.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith17.png"), + new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith18.png")); public RenderMobObelisk(RenderManager manager, float f) { super(manager, new ModelMobObelisk(), f); @@ -124,6 +124,6 @@ public class RenderMobObelisk extends RenderLiving { @Override protected ResourceLocation getEntityTexture(MobMonolith monolith) { - return monolith_textures.get(monolith.getTextureState()); //return new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/Monolith" + monolith.getTextureState() + ".png"); + return monolith_textures.get(monolith.getTextureState()); //return new ResourceLocation(DimDoors.MODID + ":textures/mobs/monolith/monolith" + monolith.getTextureState() + ".png"); } } \ No newline at end of file diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockFabric.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockFabric.java index 018c2ab4..a48501e8 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockFabric.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockFabric.java @@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack; public class ItemBlockFabric extends ItemBlock { - private final static String[] subNames = {"Reality", "Ancient", "Altered", "Unraveled", "Eternal"}; + private final static String[] subNames = {"_reality", "_ancient", "_altered", "_unraveled", "_eternal"}; public ItemBlockFabric() { - super(ModBlocks.blockFabric); + super(ModBlocks.FABRIC); setCreativeTab(DimDoors.dimDoorsCreativeTab); setMaxDamage(0); setHasSubtypes(true); diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoor.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoor.java index 012ed250..229069ee 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoor.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoor.java @@ -2,32 +2,34 @@ package com.zixiken.dimdoors.shared.items; import java.util.List; +import com.zixiken.dimdoors.DimDoors; +import com.zixiken.dimdoors.shared.blocks.BlockDimDoor; import com.zixiken.dimdoors.shared.blocks.BlockDimDoorBase; import com.zixiken.dimdoors.shared.blocks.ModBlocks; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.init.Items; import net.minecraft.item.ItemDoor; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import static com.zixiken.dimdoors.DimDoors.translateAndAdd; public class ItemDimDoor extends ItemDoorBase { - public static final String ID = "itemDimDoor"; - public ItemDimDoor() { - super(ModBlocks.blockDimDoor, (ItemDoor) Items.IRON_DOOR); - setUnlocalizedName(ID); - setRegistryName(ID); + super(ModBlocks.DIMENSIONAL_DOOR, (ItemDoor) Items.IRON_DOOR); + setUnlocalizedName(BlockDimDoor.ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimDoor.ID)); } @Override - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - translateAndAdd("info.dimDoor", tooltip); + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag advanced) { + translateAndAdd("info.dimensional_door", tooltip); } @Override protected BlockDimDoorBase getDoorBlock() { - return ModBlocks.blockDimDoor; + return ModBlocks.DIMENSIONAL_DOOR; } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorGold.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorGold.java index 90094178..64738f35 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorGold.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorGold.java @@ -2,30 +2,32 @@ package com.zixiken.dimdoors.shared.items; import java.util.List; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.blocks.BlockDimDoorBase; +import com.zixiken.dimdoors.shared.blocks.BlockDimDoorGold; import com.zixiken.dimdoors.shared.blocks.ModBlocks; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import static com.zixiken.dimdoors.DimDoors.translateAndAdd; public class ItemDimDoorGold extends ItemDoorBase { - public static final String ID = "itemDimDoorGold"; - public ItemDimDoorGold() { - super(ModBlocks.blockDimDoorGold, ModItems.itemDoorGold); - setUnlocalizedName(ID); - setRegistryName(ID); + super(ModBlocks.GOLD_DIMENSIONAL_DOOR, ModItems.GOLD_DOOR); + setUnlocalizedName(BlockDimDoorGold.ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimDoorGold.ID)); } @Override - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - translateAndAdd("info.goldDimDoor", tooltip); + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag advanced) { + translateAndAdd("info.gold_dimensional_door", tooltip); } @Override protected BlockDimDoorBase getDoorBlock() { - return ModBlocks.blockDimDoorGold; + return ModBlocks.GOLD_DIMENSIONAL_DOOR; } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorPersonal.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorPersonal.java index f0f6a6bd..1dc4d218 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorPersonal.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorPersonal.java @@ -2,30 +2,32 @@ package com.zixiken.dimdoors.shared.items; import java.util.List; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.blocks.BlockDimDoorBase; +import com.zixiken.dimdoors.shared.blocks.BlockDimDoorPersonal; import com.zixiken.dimdoors.shared.blocks.ModBlocks; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import static com.zixiken.dimdoors.DimDoors.translateAndAdd; public class ItemDimDoorPersonal extends ItemDoorBase { - public static final String ID = "itemDimDoorQuartz"; - public ItemDimDoorPersonal() { - super(ModBlocks.blockDimDoorPersonal, ModItems.itemDoorQuartz); - setUnlocalizedName(ID); - setRegistryName(ID); + super(ModBlocks.PERSONAL_DIMENSIONAL_DOOR, ModItems.QUARTZ_DOOR); + setUnlocalizedName(BlockDimDoorPersonal.ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimDoorPersonal.ID)); } @Override - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - translateAndAdd("info.personalDimDoor", tooltip); + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag advanced) { + translateAndAdd("info.quartz_dimensional_door", tooltip); } @Override protected BlockDimDoorBase getDoorBlock() { - return ModBlocks.blockDimDoorPersonal; + return ModBlocks.PERSONAL_DIMENSIONAL_DOOR; } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorUnstable.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorUnstable.java index 061a5f9f..b4506029 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorUnstable.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorUnstable.java @@ -2,29 +2,32 @@ package com.zixiken.dimdoors.shared.items; import java.util.List; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.blocks.BlockDimDoorBase; +import com.zixiken.dimdoors.shared.blocks.BlockDimDoorUnstable; import com.zixiken.dimdoors.shared.blocks.ModBlocks; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + +import static com.zixiken.dimdoors.DimDoors.translateAndAdd; public class ItemDimDoorUnstable extends ItemDoorBase { - public static final String ID = "itemDimDoorChaos"; - public ItemDimDoorUnstable() { - super(ModBlocks.blockDimDoorChaos, null); - setUnlocalizedName(ID); - setRegistryName(ID); + super(ModBlocks.UNSTABLE_DIMENSIONAL_DOOR, null); + setUnlocalizedName(BlockDimDoorUnstable.ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimDoorUnstable.ID)); } @Override - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - tooltip.add(I18n.translateToLocal("info.chaosDoor")); + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag advanced) { + translateAndAdd("info.unstable_dimensional_door", tooltip); } @Override protected BlockDimDoorBase getDoorBlock() { - return ModBlocks.blockDimDoorChaos; + return ModBlocks.UNSTABLE_DIMENSIONAL_DOOR; } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorWarp.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorWarp.java index e3453039..9ec5d22c 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorWarp.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDimDoorWarp.java @@ -2,32 +2,34 @@ package com.zixiken.dimdoors.shared.items; import java.util.List; +import com.zixiken.dimdoors.DimDoors; import com.zixiken.dimdoors.shared.blocks.BlockDimDoorBase; +import com.zixiken.dimdoors.shared.blocks.BlockDimDoorWarp; import com.zixiken.dimdoors.shared.blocks.ModBlocks; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.init.Items; import net.minecraft.item.ItemDoor; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import static com.zixiken.dimdoors.DimDoors.translateAndAdd; public class ItemDimDoorWarp extends ItemDoorBase { - public static final String ID = "itemDimDoorWarp"; - public ItemDimDoorWarp() { - super(ModBlocks.blockDimDoorWarp, (ItemDoor) Items.OAK_DOOR); - setUnlocalizedName(ID); - setRegistryName(ID); + super(ModBlocks.WARP_DIMENSIONAL_DOOR, (ItemDoor) Items.OAK_DOOR); + setUnlocalizedName(BlockDimDoorWarp.ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimDoorWarp.ID)); } @Override - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - translateAndAdd("info.warpDoor", tooltip); + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag advanced) { + translateAndAdd("info.warp_dimensional_door", tooltip); } @Override protected BlockDimDoorBase getDoorBlock() { - return ModBlocks.blockDimDoorWarp; + return ModBlocks.WARP_DIMENSIONAL_DOOR; } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorBase.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorBase.java index 7ad78941..38922d4a 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorBase.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorBase.java @@ -22,9 +22,9 @@ import static net.minecraft.item.ItemDoor.placeDoor; import net.minecraft.tileentity.TileEntity; public abstract class ItemDoorBase extends ItemDoor { + // Maps non-dimensional door items to their corresponding dimensional door item // Also maps dimensional door items to themselves for simplicity - private static HashMap doorItemMapping = new HashMap(); /** diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorGold.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorGold.java index aaa95893..76a9ce3c 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorGold.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorGold.java @@ -1,16 +1,17 @@ package com.zixiken.dimdoors.shared.items; +import com.zixiken.dimdoors.DimDoors; +import com.zixiken.dimdoors.shared.blocks.BlockDoorGold; import com.zixiken.dimdoors.shared.blocks.ModBlocks; import net.minecraft.item.ItemDoor; +import net.minecraft.util.ResourceLocation; public class ItemDoorGold extends ItemDoor { - public static final String ID = "itemDoorGold"; - public ItemDoorGold() { - super(ModBlocks.blockDoorGold); + super(ModBlocks.GOLD_DOOR); setMaxStackSize(16); - setUnlocalizedName(ID); - setRegistryName(ID); + setUnlocalizedName(BlockDoorGold.ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDoorGold.ID)); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorQuartz.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorQuartz.java index c7f13882..211fd0fc 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorQuartz.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemDoorQuartz.java @@ -1,15 +1,16 @@ package com.zixiken.dimdoors.shared.items; +import com.zixiken.dimdoors.DimDoors; +import com.zixiken.dimdoors.shared.blocks.BlockDoorQuartz; import com.zixiken.dimdoors.shared.blocks.ModBlocks; import net.minecraft.item.ItemDoor; +import net.minecraft.util.ResourceLocation; public class ItemDoorQuartz extends ItemDoor { - public static final String ID = "itemDoorQuartz"; - public ItemDoorQuartz() { - super(ModBlocks.blockDoorQuartz); - setUnlocalizedName(ID); - setRegistryName(ID); + super(ModBlocks.QUARTZ_DOOR); + setUnlocalizedName(BlockDoorQuartz.ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDoorQuartz.ID)); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftBlade.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftBlade.java index 619985df..bd975497 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftBlade.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftBlade.java @@ -12,6 +12,7 @@ import net.minecraft.item.ItemSword; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -24,13 +25,13 @@ import java.util.List; */ public class ItemRiftBlade extends ItemSword { - public static final String ID = "itemRiftBlade"; + public static final String ID = "rift_blade"; public ItemRiftBlade() { super(ToolMaterial.DIAMOND); setCreativeTab(DimDoors.dimDoorsCreativeTab); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override @@ -44,7 +45,7 @@ public class ItemRiftBlade extends ItemSword { */ @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return ModItems.itemStableFabric == repair.getItem(); + return ModItems.STABLE_FABRIC == repair.getItem(); } @Override @@ -77,6 +78,6 @@ public class ItemRiftBlade extends ItemSword { @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag advanced) { - DimDoors.translateAndAdd("info.riftblade", list); + DimDoors.translateAndAdd("info.rift_blade", list); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftConnectionTool.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftConnectionTool.java index 10bd19e2..e5c60d3e 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftConnectionTool.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftConnectionTool.java @@ -17,6 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -26,7 +27,7 @@ import net.minecraft.world.World; */ public class ItemRiftConnectionTool extends ItemTool { - public static final String ID = "itemRiftConnectionTool"; + public static final String ID = "rift_connection_tool"; ItemRiftConnectionTool() { super(1.0F, -2.8F, ToolMaterial.WOOD, new HashSet()); @@ -34,7 +35,7 @@ public class ItemRiftConnectionTool extends ItemTool { this.setMaxDamage(16); setCreativeTab(DimDoors.dimDoorsCreativeTab); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftRemover.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftRemover.java deleted file mode 100644 index ac799d0e..00000000 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftRemover.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.zixiken.dimdoors.shared.items; - -public class ItemRiftRemover { -} diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemLinkSignature.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftSignature.java similarity index 66% rename from src/main/java/com/zixiken/dimdoors/shared/items/ItemLinkSignature.java rename to src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftSignature.java index 26c559ae..ba5613e0 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemLinkSignature.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemRiftSignature.java @@ -5,24 +5,25 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import java.util.List; import static com.zixiken.dimdoors.DimDoors.translateAndAdd; -public class ItemLinkSignature extends Item { - public static final String ID = "itemLinkSignature"; +public class ItemRiftSignature extends Item { + public static final String ID = "rift_signature"; - public ItemLinkSignature() { + public ItemRiftSignature() { super(); setCreativeTab(DimDoors.dimDoorsCreativeTab); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag advanced) { - translateAndAdd("info.riftSignature.unbound", list); + translateAndAdd("info.rift_signature.unbound", list); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemStableFabric.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemStableFabric.java index e25b8a0e..bdbcd3a6 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemStableFabric.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemStableFabric.java @@ -2,15 +2,16 @@ package com.zixiken.dimdoors.shared.items; import com.zixiken.dimdoors.DimDoors; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; public class ItemStableFabric extends Item { - public static final String ID = "itemStableFabric"; + public static final String ID = "stable_fabric"; public ItemStableFabric() { super(); setCreativeTab(DimDoors.dimDoorsCreativeTab); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemStablizedRiftSig.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemStablizedRiftSig.java deleted file mode 100644 index 86a0fae1..00000000 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemStablizedRiftSig.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.zixiken.dimdoors.shared.items; - -public class ItemStablizedRiftSig { -} diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemWorldThread.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemWorldThread.java index 73854bdd..8b377e4d 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemWorldThread.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemWorldThread.java @@ -2,15 +2,16 @@ package com.zixiken.dimdoors.shared.items; import com.zixiken.dimdoors.DimDoors; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; public class ItemWorldThread extends Item { - public static final String ID = "itemWorldThread"; + public static final String ID = "world_thread"; public ItemWorldThread() { super(); setCreativeTab(DimDoors.dimDoorsCreativeTab); setUnlocalizedName(ID); - setRegistryName(ID); + setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ModItems.java b/src/main/java/com/zixiken/dimdoors/shared/items/ModItems.java index dd9c388f..e8703ecf 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ModItems.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ModItems.java @@ -1,42 +1,52 @@ package com.zixiken.dimdoors.shared.items; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import com.zixiken.dimdoors.shared.blocks.ModBlocks; public class ModItems { - public static ItemDimDoorGold itemDimDoorGold; - public static ItemDoorGold itemDoorGold; - public static ItemWorldThread itemWorldThread; - public static ItemDimDoor itemDimDoor; - public static ItemDimDoorWarp itemDimDoorWarp; - public static ItemStableFabric itemStableFabric; - public static ItemDimDoorUnstable itemDimDoorChaos; - public static ItemDoorQuartz itemDoorQuartz; - public static ItemDimDoorPersonal itemDimDoorPersonal; - public static ItemBlockFabric itemBlockFabric; - public static ItemRiftConnectionTool itemRiftConnectionTool; - public static ItemRiftBlade itemRiftBlade; + // Regular doors + public final static ItemDoorGold GOLD_DOOR = new ItemDoorGold(); + public final static ItemDoorQuartz QUARTZ_DOOR = new ItemDoorQuartz(); - public static void registerItems() { - GameRegistry.register(itemDoorQuartz = new ItemDoorQuartz()); - GameRegistry.register(itemDimDoorPersonal = new ItemDimDoorPersonal()); - GameRegistry.register(itemDoorGold = new ItemDoorGold()); - GameRegistry.register(itemDimDoorGold = new ItemDimDoorGold()); - GameRegistry.register(itemDimDoor = new ItemDimDoor()); - GameRegistry.register(itemDimDoorWarp = new ItemDimDoorWarp()); - GameRegistry.register(itemStableFabric = new ItemStableFabric()); - GameRegistry.register(itemDimDoorChaos = new ItemDimDoorUnstable()); - GameRegistry.register(itemWorldThread = new ItemWorldThread()); - GameRegistry.register(itemRiftConnectionTool = new ItemRiftConnectionTool()); - GameRegistry.register(itemRiftBlade = new ItemRiftBlade()); + // Dimensional doors + public final static ItemDimDoor DIMENSIONAL_DOOR = new ItemDimDoor(); + public final static ItemDimDoorGold GOLD_DIMENSIONAL_DOOR = new ItemDimDoorGold(); + public final static ItemDimDoorPersonal PERSONAL_DIMENSIONAL_DOOR = new ItemDimDoorPersonal(); + public final static ItemDimDoorUnstable UNSTABLE_DIMENSIONAL_DOOR = new ItemDimDoorUnstable(); + public final static ItemDimDoorWarp WARP_DIMENSIONAL_DOOR = new ItemDimDoorWarp(); - //ItemBlocks - GameRegistry.register(itemBlockFabric = new ItemBlockFabric()); - GameRegistry.register(new ItemBlock(ModBlocks.blockDimHatch) - .setRegistryName(ModBlocks.blockDimHatch.getRegistryName())); - GameRegistry.register(new ItemBlock(ModBlocks.blockRift) - .setRegistryName(ModBlocks.blockRift.getRegistryName())); + // Fabric + public final static ItemWorldThread WORLD_THREAD = new ItemWorldThread(); + public final static ItemBlockFabric FABRIC = new ItemBlockFabric(); + public final static ItemStableFabric STABLE_FABRIC = new ItemStableFabric(); + + // Tools + public final static ItemRiftConnectionTool RIFT_CONNECTION_TOOL = new ItemRiftConnectionTool(); + public final static ItemRiftBlade RIFT_BLADE = new ItemRiftBlade(); + + @SubscribeEvent + public static void registerItems(RegistryEvent.Register event) { + event.getRegistry().register(QUARTZ_DOOR); + event.getRegistry().register(PERSONAL_DIMENSIONAL_DOOR); + event.getRegistry().register(GOLD_DOOR); + event.getRegistry().register(GOLD_DIMENSIONAL_DOOR); + event.getRegistry().register(DIMENSIONAL_DOOR); + event.getRegistry().register(WARP_DIMENSIONAL_DOOR); + event.getRegistry().register(STABLE_FABRIC); + event.getRegistry().register(UNSTABLE_DIMENSIONAL_DOOR); + event.getRegistry().register(WORLD_THREAD); + event.getRegistry().register(RIFT_CONNECTION_TOOL); + event.getRegistry().register(RIFT_BLADE); + + // ItemBlocks + event.getRegistry().register(FABRIC); + event.getRegistry().register(new ItemBlock(ModBlocks.DIMENSIONAL_TRAPDOOR) + .setRegistryName(ModBlocks.DIMENSIONAL_TRAPDOOR.getRegistryName())); + event.getRegistry().register(new ItemBlock(ModBlocks.RIFT) + .setRegistryName(ModBlocks.RIFT.getRegistryName())); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/tileentities/TileEntityRift.java b/src/main/java/com/zixiken/dimdoors/shared/tileentities/TileEntityRift.java index bf7371a8..378c5ab4 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/tileentities/TileEntityRift.java +++ b/src/main/java/com/zixiken/dimdoors/shared/tileentities/TileEntityRift.java @@ -46,7 +46,7 @@ public class TileEntityRift extends DDTileEntityBase implements ITickable { @Override public void update() { - if (world.getBlockState(pos).getBlock() != ModBlocks.blockRift) { + if (world.getBlockState(pos).getBlock() != ModBlocks.RIFT) { invalidate(); return; } diff --git a/src/main/java/com/zixiken/dimdoors/shared/util/Schematic.java b/src/main/java/com/zixiken/dimdoors/shared/util/Schematic.java index d6566651..8e4b82b9 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/util/Schematic.java +++ b/src/main/java/com/zixiken/dimdoors/shared/util/Schematic.java @@ -11,13 +11,20 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; + +import com.zixiken.dimdoors.shared.SchematicHandler; +import com.zixiken.dimdoors.shared.blocks.BlockFabric; +import com.zixiken.dimdoors.shared.blocks.ModBlocks; import net.minecraft.block.Block; +import net.minecraft.block.BlockDoor; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.ForgeRegistries; @@ -34,10 +41,10 @@ public class Schematic { "Warp Door"}; private static final String[] NEWDIMDOORBLOCKNAMES = new String[]{ - "blockDimDoor", - "blockFabric", //[type=fabric] is the default blockstate - "blockDimDoorTransient", - "blockDimDoorWarp"}; + "dimensional_door", + "fabric", //[type=fabric] is the default blockstate + "transient_dimensional_door", + "warp_dimensional_door"}; int version = Integer.parseInt("1"); //@todo set in build.gradle ${spongeSchematicVersion} String author = "DimDoors"; //@todo set in build.gradle ${modID} @@ -341,7 +348,7 @@ public class Schematic { Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockString)); blockstate = block.getDefaultState(); } else { - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation("dimdoors:blockFabric")); + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation("dimdoors:FABRIC")); blockstate = getBlockStateWithProperties(block, new String[]{"type=ancient"}); } schematic.pallette.add(blockstate); @@ -387,7 +394,7 @@ public class Schematic { private static String convertOldDimDoorsBlockNameToNewDimDoorsBlockName(String dimdoorsBlockName) { if (OLDDIMDOORBLOCKNAMES.length != NEWDIMDOORBLOCKNAMES.length) { - DimDoors.warn(Schematic.class, "The array of old dimdoors block names somehow isn't the same length as the array of new names, therefore the dimdoors blocks in this schematic will not be loaded. This is a bug in the DimDoors mod itself."); + DimDoors.warn(Schematic.class, "The array of old DimDoors block names somehow isn't the same length as the array of new names, therefore the dimdoors blocks in this schematic will not be loaded. This is a bug in the DimDoors mod itself."); return null; } @@ -404,11 +411,10 @@ public class Schematic { return null; } - /* - public static void TempGenerateDefaultSchematics() { + public static void tempGenerateDefaultSchematics() { for (int pocketSize = 0; pocketSize < 8; pocketSize++) { - generateDefaultSchematic("defaultPublic", pocketSize, ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.REALITY), ModBlocks.blockDimDoor); - generateDefaultSchematic("defaultPrivate", pocketSize, ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ALTERED), ModBlocks.blockDimDoorPersonal); + generateDefaultSchematic("defaultPublic", pocketSize, ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.REALITY), ModBlocks.DIMENSIONAL_DOOR); + generateDefaultSchematic("defaultPrivate", pocketSize, ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ALTERED), ModBlocks.PERSONAL_DIMENSIONAL_DOOR); } } @@ -430,7 +436,7 @@ public class Schematic { schematic.paletteMax = 4; schematic.pallette = new ArrayList(); schematic.pallette.add(Blocks.AIR.getDefaultState()); - schematic.pallette.add(ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ANCIENT)); + schematic.pallette.add(ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ANCIENT)); schematic.pallette.add(innerWallBlockState); schematic.pallette.add(doorBlock.getDefaultState().withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.LOWER)); //bottom schematic.pallette.add(doorBlock.getDefaultState().withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.UPPER)); //top @@ -470,5 +476,4 @@ public class Schematic { SchematicHandler.INSTANCE.saveSchematic(schematic, schematic.schematicName); } - */ } diff --git a/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboDecay.java b/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboDecay.java index ef857a5f..0aba33db 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboDecay.java +++ b/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboDecay.java @@ -34,7 +34,7 @@ public class LimboDecay { public static IBlockState[] getDecaySequence() { if (decaySequence == null) { decaySequence = new IBlockState[] { - ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED), + ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED), Blocks.GRAVEL.getDefaultState(), Blocks.COBBLESTONE.getDefaultState(), Blocks.STONE.getDefaultState() @@ -47,16 +47,16 @@ public class LimboDecay { public static IBlockState[] getBlocksImmuneToDecay() { if (blocksImmuneToDecay == null) { blocksImmuneToDecay = new IBlockState[] { - ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED), - ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ETERNAL), - ModBlocks.blockDimDoorTransient.getDefaultState(), - ModBlocks.blockDimDoor.getDefaultState(), - ModBlocks.blockDimDoorWarp.getDefaultState(), - ModBlocks.blockRift.getDefaultState(), - ModBlocks.blockDimDoorChaos.getDefaultState(), - ModBlocks.blockDoorGold.getDefaultState(), - ModBlocks.blockDoorQuartz.getDefaultState(), - ModBlocks.blockDimDoorGold.getDefaultState() + ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED), + ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ETERNAL), + ModBlocks.TRANSIENT_DIMENSIONAL_DOOR.getDefaultState(), + ModBlocks.DIMENSIONAL_DOOR.getDefaultState(), + ModBlocks.WARP_DIMENSIONAL_DOOR.getDefaultState(), + ModBlocks.RIFT.getDefaultState(), + ModBlocks.UNSTABLE_DIMENSIONAL_DOOR.getDefaultState(), + ModBlocks.GOLD_DOOR.getDefaultState(), + ModBlocks.QUARTZ_DOOR.getDefaultState(), + ModBlocks.GOLD_DIMENSIONAL_DOOR.getDefaultState() }; } @@ -120,7 +120,7 @@ public class LimboDecay { private static boolean decayBlockFast(World world, BlockPos pos) { IBlockState block = world.getBlockState(pos); if (canDecayBlock(block, world, pos)) { - world.setBlockState(pos, ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED)); + world.setBlockState(pos, ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED)); return true; } return false; diff --git a/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboGenerator.java b/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboGenerator.java index 09b044fd..2c53da1c 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboGenerator.java +++ b/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboGenerator.java @@ -306,10 +306,10 @@ public class LimboGenerator implements IChunkGenerator int zCoord = zSectionPart + zRel; if(vxyz > 0) { primer.setBlockState(xCoord, yCoord, zCoord, - ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED)); + ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED)); } else if(yCoord < 6) { primer.setBlockState(xCoord, yCoord, zCoord, - ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ETERNAL)); + ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ETERNAL)); } } diff --git a/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboSkyProvider.java b/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboSkyProvider.java index c7d8c182..9cdac6cc 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboSkyProvider.java +++ b/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/LimboSkyProvider.java @@ -8,8 +8,8 @@ import net.minecraft.util.ResourceLocation; * Created by Jared Johnson on 1/24/2017. */ public class LimboSkyProvider extends CustomSkyProvider { - private static final ResourceLocation limboMoonResourceLoc = new ResourceLocation(DimDoors.MODID + ":textures/other/limboMoon.png"); - private static final ResourceLocation limboSunResourceLoc = new ResourceLocation(DimDoors.MODID + ":textures/other/limboSun.png"); + private static final ResourceLocation limboMoonResourceLoc = new ResourceLocation(DimDoors.MODID + ":textures/other/limbo_moon.png"); + private static final ResourceLocation limboSunResourceLoc = new ResourceLocation(DimDoors.MODID + ":textures/other/limbo_sun.png"); @Override public ResourceLocation getMoonRenderPath() { diff --git a/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/WorldProviderLimbo.java b/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/WorldProviderLimbo.java index 27d9a1fd..8a7c77ef 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/WorldProviderLimbo.java +++ b/src/main/java/com/zixiken/dimdoors/shared/world/limbodimension/WorldProviderLimbo.java @@ -92,7 +92,7 @@ public class WorldProviderLimbo extends WorldProvider { @Override public boolean canCoordinateBeSpawn(int x, int z) { BlockPos pos = this.world.getTopSolidOrLiquidBlock(new BlockPos(x, 0, z)); - return world.getBlockState(pos).equals(ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED)); + return world.getBlockState(pos).equals(ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED)); } @Override diff --git a/src/main/java/com/zixiken/dimdoors/shared/world/pocketdimension/PocketSkyProvider.java b/src/main/java/com/zixiken/dimdoors/shared/world/pocketdimension/PocketSkyProvider.java index 192b7da8..c6b7ac63 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/world/pocketdimension/PocketSkyProvider.java +++ b/src/main/java/com/zixiken/dimdoors/shared/world/pocketdimension/PocketSkyProvider.java @@ -10,11 +10,11 @@ public class PocketSkyProvider extends CustomSkyProvider { @Override public ResourceLocation getMoonRenderPath() { - return new ResourceLocation("DimDoors:textures/other/limboMoon.png"); + return new ResourceLocation("DimDoors:textures/other/limbo_moon.png"); } @Override public ResourceLocation getSunRenderPath() { - return new ResourceLocation("DimDoors:textures/other/limboSun.png"); + return new ResourceLocation("DimDoors:textures/other/limbo_sun.png"); } } diff --git a/src/main/resources/assets/dimdoors/blockstates/blockDimDoor.json b/src/main/resources/assets/dimdoors/blockstates/blockDimDoor.json deleted file mode 100644 index 306ccc7f..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockDimDoor.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoor_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoor_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoor_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoor_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoor_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoor_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoor_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoor_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoor_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoor_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoor_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoor_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoor_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoor_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoor_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoor_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoor_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoor_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoor_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoor_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoor_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoor_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoor_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoor_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoor_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoor_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoor_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoor_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoor_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoor_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoor_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoor_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorChaos.json b/src/main/resources/assets/dimdoors/blockstates/blockDimDoorChaos.json deleted file mode 100644 index cb64440f..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorChaos.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoorChaos_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoorChaos_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoorChaos_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoorChaos_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoorChaos_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoorChaos_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoorChaos_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoorChaos_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoorChaos_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoorChaos_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoorChaos_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoorChaos_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoorChaos_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoorChaos_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoorChaos_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoorChaos_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoorChaos_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoorChaos_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoorChaos_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoorChaos_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoorChaos_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoorChaos_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoorChaos_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoorChaos_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoorChaos_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoorChaos_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoorChaos_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoorChaos_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoorChaos_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoorChaos_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoorChaos_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoorChaos_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorGold.json b/src/main/resources/assets/dimdoors/blockstates/blockDimDoorGold.json deleted file mode 100644 index 3eaea7d5..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorGold.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorPersonal.json b/src/main/resources/assets/dimdoors/blockstates/blockDimDoorPersonal.json deleted file mode 100644 index e590e90f..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorPersonal.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorTransient.json b/src/main/resources/assets/dimdoors/blockstates/blockDimDoorTransient.json deleted file mode 100644 index 9837d929..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorTransient.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "dimdoors:noTexture"} - } -} diff --git a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorWarp.json b/src/main/resources/assets/dimdoors/blockstates/blockDimDoorWarp.json deleted file mode 100644 index 1232ff85..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockDimDoorWarp.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoorWarp_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoorWarp_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoorWarp_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDimDoorWarp_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoorWarp_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoorWarp_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoorWarp_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDimDoorWarp_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoorWarp_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoorWarp_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoorWarp_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDimDoorWarp_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoorWarp_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoorWarp_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoorWarp_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDimDoorWarp_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoorWarp_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoorWarp_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoorWarp_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDimDoorWarp_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoorWarp_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoorWarp_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoorWarp_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDimDoorWarp_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoorWarp_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoorWarp_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoorWarp_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDimDoorWarp_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoorWarp_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoorWarp_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoorWarp_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDimDoorWarp_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/dimdoors/blockstates/blockDoorGold.json b/src/main/resources/assets/dimdoors/blockstates/blockDoorGold.json deleted file mode 100644 index 3eaea7d5..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockDoorGold.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorGold_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorGold_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorGold_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorGold_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/dimdoors/blockstates/blockDoorQuartz.json b/src/main/resources/assets/dimdoors/blockstates/blockDoorQuartz.json deleted file mode 100644 index e590e90f..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockDoorQuartz.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "dimdoors:blockDoorQuartz_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "dimdoors:blockDoorQuartz_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "dimdoors:blockDoorQuartz_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/dimdoors/blockstates/blockFabric.json b/src/main/resources/assets/dimdoors/blockstates/blockFabric.json deleted file mode 100644 index 946c420e..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockFabric.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "type=reality": { "model": "dimdoors:blockFabricReality" }, - "type=ancient": { "model": "dimdoors:blockFabricAncient" }, - "type=altered": { "model": "dimdoors:blockFabricAltered" }, - "type=unraveled": { "model": "dimdoors:blockFabricUnraveled" }, - "type=eternal": { "model": "dimdoors:blockFabricEternal" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/blockstates/blockRift.json b/src/main/resources/assets/dimdoors/blockstates/blockRift.json deleted file mode 100644 index 9837d929..00000000 --- a/src/main/resources/assets/dimdoors/blockstates/blockRift.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "dimdoors:noTexture"} - } -} diff --git a/src/main/resources/assets/dimdoors/blockstates/dimensional_door.json b/src/main/resources/assets/dimdoors/blockstates/dimensional_door.json new file mode 100644 index 00000000..29095db7 --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/dimensional_door.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:dimensional_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:dimensional_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:dimensional_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:dimensional_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:dimensional_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:dimensional_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:dimensional_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:dimensional_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:dimensional_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:dimensional_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:dimensional_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:dimensional_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:dimensional_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:dimensional_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:dimensional_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:dimensional_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:dimensional_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:dimensional_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:dimensional_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:dimensional_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:dimensional_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:dimensional_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:dimensional_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:dimensional_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:dimensional_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:dimensional_door_top", "y": 180 }, + "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:dimensional_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:dimensional_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:dimensional_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:dimensional_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:dimensional_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:dimensional_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:dimensional_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:dimensional_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:dimensional_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:dimensional_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:dimensional_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:dimensional_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:dimensional_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:dimensional_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:dimensional_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:dimensional_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:dimensional_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:dimensional_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:dimensional_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:dimensional_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:dimensional_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:dimensional_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:dimensional_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:dimensional_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:dimensional_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:dimensional_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:dimensional_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/dimdoors/blockstates/blockDimHatch.json b/src/main/resources/assets/dimdoors/blockstates/dimensional_trapdoor.json similarity index 57% rename from src/main/resources/assets/dimdoors/blockstates/blockDimHatch.json rename to src/main/resources/assets/dimdoors/blockstates/dimensional_trapdoor.json index 6b6c19ae..ffb10af1 100644 --- a/src/main/resources/assets/dimdoors/blockstates/blockDimHatch.json +++ b/src/main/resources/assets/dimdoors/blockstates/dimensional_trapdoor.json @@ -1,20 +1,20 @@ { "variants": { - "facing=north,half=bottom,open=false": { "model": "dimdoors:blockDimHatch_bottom" }, - "facing=south,half=bottom,open=false": { "model": "dimdoors:blockDimHatch_bottom" }, - "facing=east,half=bottom,open=false": { "model": "dimdoors:blockDimHatch_bottom" }, - "facing=west,half=bottom,open=false": { "model": "dimdoors:blockDimHatch_bottom" }, - "facing=north,half=top,open=false": { "model": "dimdoors:blockDimHatch_top" }, - "facing=south,half=top,open=false": { "model": "dimdoors:blockDimHatch_top" }, - "facing=east,half=top,open=false": { "model": "dimdoors:blockDimHatch_top" }, - "facing=west,half=top,open=false": { "model": "dimdoors:blockDimHatch_top" }, - "facing=north,half=bottom,open=true": { "model": "dimdoors:blockDimHatch_open" }, - "facing=south,half=bottom,open=true": { "model": "dimdoors:blockDimHatch_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "dimdoors:blockDimHatch_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "dimdoors:blockDimHatch_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "dimdoors:blockDimHatch_open" }, - "facing=south,half=top,open=true": { "model": "dimdoors:blockDimHatch_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "dimdoors:blockDimHatch_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "dimdoors:blockDimHatch_open", "y": 270 } + "facing=north,half=bottom,open=false": { "model": "dimdoors:dimensional_trapdoor_bottom" }, + "facing=south,half=bottom,open=false": { "model": "dimdoors:dimensional_trapdoor_bottom" }, + "facing=east,half=bottom,open=false": { "model": "dimdoors:dimensional_trapdoor_bottom" }, + "facing=west,half=bottom,open=false": { "model": "dimdoors:dimensional_trapdoor_bottom" }, + "facing=north,half=top,open=false": { "model": "dimdoors:dimensional_trapdoor_top" }, + "facing=south,half=top,open=false": { "model": "dimdoors:dimensional_trapdoor_top" }, + "facing=east,half=top,open=false": { "model": "dimdoors:dimensional_trapdoor_top" }, + "facing=west,half=top,open=false": { "model": "dimdoors:dimensional_trapdoor_top" }, + "facing=north,half=bottom,open=true": { "model": "dimdoors:dimensional_trapdoor_open" }, + "facing=south,half=bottom,open=true": { "model": "dimdoors:dimensional_trapdoor_open", "y": 180 }, + "facing=east,half=bottom,open=true": { "model": "dimdoors:dimensional_trapdoor_open", "y": 90 }, + "facing=west,half=bottom,open=true": { "model": "dimdoors:dimensional_trapdoor_open", "y": 270 }, + "facing=north,half=top,open=true": { "model": "dimdoors:dimensional_trapdoor_open" }, + "facing=south,half=top,open=true": { "model": "dimdoors:dimensional_trapdoor_open", "y": 180 }, + "facing=east,half=top,open=true": { "model": "dimdoors:dimensional_trapdoor_open", "y": 90 }, + "facing=west,half=top,open=true": { "model": "dimdoors:dimensional_trapdoor_open", "y": 270 } } } diff --git a/src/main/resources/assets/dimdoors/blockstates/fabric.json b/src/main/resources/assets/dimdoors/blockstates/fabric.json new file mode 100644 index 00000000..a1bd0580 --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/fabric.json @@ -0,0 +1,9 @@ +{ + "variants": { + "type=reality": { "model": "dimdoors:fabric_reality" }, + "type=ancient": { "model": "dimdoors:fabric_ancient" }, + "type=altered": { "model": "dimdoors:fabric_altered" }, + "type=unraveled": { "model": "dimdoors:fabric_unraveled" }, + "type=eternal": { "model": "dimdoors:fabric_eternal" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/blockstates/gold_dimensional_door.json b/src/main/resources/assets/dimdoors/blockstates/gold_dimensional_door.json new file mode 100644 index 00000000..411bdeff --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/gold_dimensional_door.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_top", "y": 180 }, + "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/dimdoors/blockstates/gold_door.json b/src/main/resources/assets/dimdoors/blockstates/gold_door.json new file mode 100644 index 00000000..411bdeff --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/gold_door.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:gold_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:gold_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:gold_door_top", "y": 180 }, + "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:gold_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:gold_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:gold_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/dimdoors/blockstates/quartz_dimensional_door.json b/src/main/resources/assets/dimdoors/blockstates/quartz_dimensional_door.json new file mode 100644 index 00000000..04a8483b --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/quartz_dimensional_door.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_top", "y": 180 }, + "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/dimdoors/blockstates/quartz_door.json b/src/main/resources/assets/dimdoors/blockstates/quartz_door.json new file mode 100644 index 00000000..04a8483b --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/quartz_door.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:quartz_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:quartz_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:quartz_door_top", "y": 180 }, + "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:quartz_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:quartz_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:quartz_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/dimdoors/blockstates/rift.json b/src/main/resources/assets/dimdoors/blockstates/rift.json new file mode 100644 index 00000000..8201baa5 --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/rift.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": {"model": "dimdoors:no_texture"} + } +} diff --git a/src/main/resources/assets/dimdoors/blockstates/transient_dimensional_door.json b/src/main/resources/assets/dimdoors/blockstates/transient_dimensional_door.json new file mode 100644 index 00000000..8201baa5 --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/transient_dimensional_door.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": {"model": "dimdoors:no_texture"} + } +} diff --git a/src/main/resources/assets/dimdoors/blockstates/unstable_dimensional_door.json b/src/main/resources/assets/dimdoors/blockstates/unstable_dimensional_door.json new file mode 100644 index 00000000..2f0c39ed --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/unstable_dimensional_door.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:unstable_dimensional_door_top", "y": 180 }, + "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:unstable_dimensional_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/dimdoors/blockstates/warp_dimensional_door.json b/src/main/resources/assets/dimdoors/blockstates/warp_dimensional_door.json new file mode 100644 index 00000000..85b722d8 --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/warp_dimensional_door.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "dimdoors:warp_dimensional_door_top", "y": 180 }, + "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_top" }, + "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_top" }, + "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "dimdoors:warp_dimensional_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/dimdoors/lang/de_DE.lang b/src/main/resources/assets/dimdoors/lang/de_DE.lang index 6200c558..997d4a3f 100644 --- a/src/main/resources/assets/dimdoors/lang/de_DE.lang +++ b/src/main/resources/assets/dimdoors/lang/de_DE.lang @@ -1,59 +1,79 @@ -itemGroup.dimDoorsCreativeTab=Dimensional Doors: Items -tile.doorGold.name=Goldtür -tile.transientDoor.name=Vergängliche Tür -tile.dimDoorGold.name=Goldene Dimensionaltür -tile.doorQuartz.name=Quarztür -tile.dimDoorPersonal.name=Persönliche Dimensionaltür -tile.blockDimWall.name=Stoff der Realität -tile.blockAlteredWall.name=Veränderter Stoff -tile.blockAncientWall.name=Antiker Stoff -tile.blockDimWallPerm.name=Ewiger Stoff -tile.dimDoorWarp.name=Warp-Tür +itemGroup.dimensional_doors_creative_tab=Dimensional Doors: Items + +tile.gold_door.name=Goldtür +tile.quartz_door.name=Quarztür + +tile.dimensional_door.name=Dimensionaltür +tile.gold_dimensional_door.name=Goldene Dimensionaltür +tile.quartz_dimensional_door.name=Persönliche Dimensionaltür +tile.unstable_dimensional_door.name=Instabile Tür +tile.warp_dimensional_door.name=Warp-Tür +tile.dimensional_trapdoor.name=Transdimensionale Falltür +tile.transient_dimensional_door.name=Vergängliche Tür + +tile.fabric_reality.name=Stoff der Realität +tile.fabric_altered.name=Veränderter Stoff +tile.fabric_ancient.name=Antiker Stoff +tile.fabric_eternal.name=Ewiger Stoff +tile.fabric_unraveled.name=Entwirrter Stoff tile.rift.name=Spalt -tile.BlockLimbo.name=Entwirrter Stoff -tile.chaosDoor.name=Instabile Tür -tile.dimDoor.name=Dimensionaltür -tile.dimHatch.name=Transdimensionale Falltür -item.itemGoldDoor.name=Goldtür -item.itemDDKey=Spaltschlüssel -item.itemQuartzDoor.name=Quarztür -item.itemQuartzDimDoor.name=Persönliche Dimensionaltür -item.itemGoldDimDoor.name=Goldene Dimensionaltür -item.itemDimDoor.name=Dimensionaltür -item.itemDimDoorWarp.name=Warp-Tür -item.itemLinkSignature.name=Spaltsignatur -item.itemStabilizedRiftSig.name=Stabilisierte Spaltsignatur -item.itemRiftRemover.name=Spaltentferner -item.itemStableFabric.name=Stabiler Stoff -item.itemChaosDoor.name=Instabile Tür -item.ItemRiftBlade.name=Spaltklinge -item.itemWorldThread.name=Weltenfaden -info.riftkey.bound=Gebunden -info.riftkey.unbound=Nicht gebunden -info.dimDoor0=Platziere auf dem Block unterhalb eines Spalts, -info.dimDoor1=um diesen Spalt zu aktivieren, oder -info.dimDoor2=irgendwo anders, um eine -info.dimDoor3=kleine Dimension to erschaffen. -info.goldDimDoor0=Ähnlich einer Dimensionaltür, -info.goldDimDoor1=aber hält die kleine Dimension geladen, -info.goldDimDoor2=sollte sie in einer solchen platziert sein. -info.personalDimDoor0=Erstellt einen Pfad zu -info.personalDimDoor1=deiner persönlichen Dimension -info.riftblade0=Öffnet temporäre Türen auf Spalten -info.riftblade1=und hat einen Teleport-Angriff. -info.riftRemover0=Verwende nahe eines offenen Spalts, -info.riftRemover1=um ihn und jegliche Spalte -info.riftRemover2=in der Nähe zu entfernen. -info.riftSignature.bound=Führt zu(%d, %d, %d) in Dimension #%d -info.riftSignature.unbound0=Erster Klick speichert die Position; -info.riftSignature.unbound1=zweiter Klick kreiert ein Paar von Spalten, -info.riftSignature.unbound2=welche zu den zwei Positionen führen. -info.riftSignature.stable0=Erster Klick speichert die Position, -info.riftSignature.stable1=weitere Klicks kreieren Spalte, die -info.riftSignature.stable2=die erste und die aktuelle Position verbinden. -info.chaosDoor=Vorsicht: Führt zu einem zufälligen Ziel -info.warpDoor0=Platziere auf dem Block unterhalb eines -info.warpDoor1=Spalts, um ein Portal zu erstellen, -info.warpDoor2=oder platziere irgendwo in einer -info.warpDoor3=kleinen Dimension, um sie zu verlassen. -entity.dimdoors.Monolith.name=Monolith + +item.gold_door.name=Goldtür +item.quartz_door.name=Quarztür + +item.dimensional_door.name=Dimensionaltür +item.gold_dimensional_door.name=Goldene Dimensionaltür +item.quartz_dimensional_door.name=Persönliche Dimensionaltür +item.unstable_dimensional_door.name=Instabile Tür +item.warp_dimensional_door.name=Warp-Tür + +item.rift_key=Spaltschlüssel +item.rift_signature.name=Spaltsignatur +item.stabilized_rift_signature.name=Stabilisierte Spaltsignatur +item.rift_connection_tool.name=Below Average Rift Connection Tool +item.rift_remover.name=Spaltentferner +item.rift_blade.name=Spaltklinge + +item.world_thread.name=Weltenfaden +item.stable_fabric.name=Stabiler Stoff + +info.rift_key.bound=Gebunden +info.rift_key.unbound=Nicht gebunden + +info.dimensional_door0=Platziere auf dem Block unterhalb eines Spalts, +info.dimensional_door1=um diesen Spalt zu aktivieren, oder +info.dimensional_door2=irgendwo anders, um eine +info.dimensional_door3=kleine Dimension to erschaffen. + +info.gold_dimensional_door0=Ähnlich einer Dimensionaltür, +info.gold_dimensional_door1=aber hält die kleine Dimension geladen, +info.gold_dimensional_door2=sollte sie in einer solchen platziert sein. + +info.quartz_dimensional_door0=Erstellt einen Pfad zu +info.quartz_dimensional_door1=deiner persönlichen Dimension + +info.rift_blade0=Öffnet temporäre Türen auf Spalten +info.rift_blade1=und hat einen Teleport-Angriff. + +info.rift_remover0=Verwende nahe eines offenen Spalts, +info.rift_remover1=um ihn und jegliche Spalte +info.rift_remover2=in der Nähe zu entfernen. + +info.rift_signature.bound=Führt zu(%d, %d, %d) in Dimension #%d + +info.rift_signature.unbound0=Erster Klick speichert die Position; +info.rift_signature.unbound1=zweiter Klick kreiert ein Paar von Spalten, +info.rift_signature.unbound2=welche zu den zwei Positionen führen. + +info.rift_signature.stable0=Erster Klick speichert die Position, +info.rift_signature.stable1=weitere Klicks kreieren Spalte, die +info.rift_signature.stable2=die erste und die aktuelle Position verbinden. + +info.unstable_dimensional_door=Vorsicht: Führt zu einem zufälligen Ziel + +info.warp_dimensional_door0=Platziere auf dem Block unterhalb eines +info.warp_dimensional_door1=Spalts, um ein Portal zu erstellen, +info.warp_dimensional_door2=oder platziere irgendwo in einer +info.warp_dimensional_door3=kleinen Dimension, um sie zu verlassen. + +entity.dimdoors.monolith.name=Monolith \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/lang/en_US.lang b/src/main/resources/assets/dimdoors/lang/en_US.lang index e43f07d6..f7609c20 100644 --- a/src/main/resources/assets/dimdoors/lang/en_US.lang +++ b/src/main/resources/assets/dimdoors/lang/en_US.lang @@ -1,60 +1,79 @@ -itemGroup.dimDoorsCreativeTab=Dimensional Doors Items -tile.doorGold.name=Golden Door -tile.transientDoor.name=Transient Door -tile.dimDoorGold.name=Golden Dimensional Door -tile.doorQuartz.name=Quartz Door -tile.dimDoorPersonal.name=Personal Dimensional Door -tile.blockFabricReality.name=Fabric of Reality -tile.blockFabricAltered.name=Altered Fabric -tile.blockFabricAncient.name=Ancient Fabric -tile.blockFabricEternal.name=Eternal Fabric -tile.blockFabricUnraveled.name=Unraveled Fabric -tile.dimDoorWarp.name=Warp Door -tile.blockRift.name=Rift -tile.chaosDoor.name=Chaos Door -tile.dimDoor.name=Dimensional Door -tile.blockDimHatch.name=Transdimensional Trapdoor -item.itemDoorGold.name=Golden Door -item.itemDDKey=Rift Key -item.itemDoorQuartz.name=Quartz Door -item.itemDimDoorQuartz.name=Personal Dimensional Door -item.itemDimDoorGold.name=Golden Dimensional Door -item.itemDimDoor.name=Dimensional Door -item.itemDimDoorWarp.name=Warp Door -item.itemLinkSignature.name=Rift Signature -item.itemStabilizedRiftSig.name=Stabilized Rift Signature -item.itemRiftConnectionTool.name=Below Average Rift Connection Tool -item.itemRiftRemover.name=Rift Remover -item.itemStableFabric.name=Stable Fabric -item.itemDimDoorChaos.name=Chaos Door -item.itemRiftBlade.name=Rift Blade -item.itemWorldThread.name=World Thread -info.riftkey.bound=Bound -info.riftkey.unbound=Unbound -info.dimDoor0=Place on the block under a rift -info.dimDoor1=to activate that rift or place -info.dimDoor2=anywhere else to create a -info.dimDoor3=pocket dimension. -info.goldDimDoor0=Similar to a Dimensional Door -info.goldDimDoor1=but keeps a pocket dimension -info.goldDimDoor2=loaded if placed on the inside. -info.personalDimDoor0=Creates a pathway to -info.personalDimDoor1=your personal pocket -info.riftblade0=Opens temporary doors on rifts -info.riftblade1=and has a teleport attack. -info.riftRemover0=Use near exposed rift -info.riftRemover1=to remove it and -info.riftRemover2=any nearby rifts. -info.riftSignature.bound=Leads to (%d, %d, %d) at dimension #%d -info.riftSignature.unbound0=First click stores a location; -info.riftSignature.unbound1=second click creates a pair of -info.riftSignature.unbound2=rifts linking the two locations. -info.riftSignature.stable0=First click stores a location, -info.riftSignature.stable1=other clicks create rifts linking -info.riftSignature.stable2=the first and last locations together. -info.chaosDoor=Caution: Leads to random destination -info.warpDoor0=Place on the block under -info.warpDoor1=a rift to create a portal, -info.warpDoor2=or place anywhere in a -info.warpDoor3=pocket dimension to exit. -entity.dimdoors.Monolith.name=Monolith \ No newline at end of file +itemGroup.dimensional_doors_creative_tab=Dimensional Doors Items + +tile.gold_door.name=Golden Door +tile.quartz_door.name=Quartz Door + +tile.dimensional_door.name=Dimensional Door +tile.gold_dimensional_door.name=Golden Dimensional Door +tile.quartz_dimensional_door.name=Personal Dimensional Door +tile.unstable_dimensional_door.name=Unstable Door +tile.warp_dimensional_door.name=Warp Door +tile.dimensional_trapdoor.name=Transdimensional Trapdoor +tile.transient_dimensional_door.name=Transient Door + +tile.fabric_reality.name=Fabric of Reality +tile.fabric_altered.name=Altered Fabric +tile.fabric_ancient.name=Ancient Fabric +tile.fabric_eternal.name=Eternal Fabric +tile.fabric_unraveled.name=Unraveled Fabric +tile.rift.name=Rift + +item.gold_door.name=Golden Door +item.quartz_door.name=Quartz Door + +item.dimensional_door.name=Dimensional Door +item.gold_dimensional_door.name=Golden Dimensional Door +item.quartz_dimensional_door.name=Personal Dimensional Door +item.unstable_dimensional_door.name=Unstable Door +item.warp_dimensional_door.name=Warp Door + +item.rift_key=Rift Key +item.rift_signature.name=Rift Signature +item.stabilized_rift_signature.name=Stabilized Rift Signature +item.rift_connection_tool.name=Below Average Rift Connection Tool +item.rift_remover.name=Rift Remover +item.rift_blade.name=Rift Blade + +item.world_thread.name=World Thread +item.stable_fabric.name=Stable Fabric + +info.rift_key.bound=Bound +info.rift_key.unbound=Unbound + +info.dimensional_door0=Place on the block under a rift +info.dimensional_door1=to activate that rift or place +info.dimensional_door2=anywhere else to create a +info.dimensional_door3=pocket dimension. + +info.gold_dimensional_door0=Similar to a Dimensional Door +info.gold_dimensional_door1=but keeps a pocket dimension +info.gold_dimensional_door2=loaded if placed on the inside. + +info.quartz_dimensional_door0=Creates a pathway to +info.quartz_dimensional_door1=your personal pocket + +info.rift_blade0=Opens temporary doors on rifts +info.rift_blade1=and has a teleport attack. + +info.rift_remover0=Use near exposed rift +info.rift_remover1=to remove it and +info.rift_remover2=any nearby rifts. + +info.rift_signature.bound=Leads to (%d, %d, %d) at dimension #%d + +info.rift_signature.unbound0=First click stores a location; +info.rift_signature.unbound1=second click creates a pair of +info.rift_signature.unbound2=rifts linking the two locations. + +info.rift_signature.stable0=First click stores a location, +info.rift_signature.stable1=other clicks create rifts linking +info.rift_signature.stable2=the first and last locations together. + +info.unstable_dimensional_door=Caution: Leads to random destination + +info.warp_dimensional_door0=Place on the block under +info.warp_dimensional_door1=a rift to create a portal, +info.warp_dimensional_door2=or place anywhere in a +info.warp_dimensional_door3=pocket dimension to exit. + +entity.dimdoors.monolith.name=Monolith \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/lang/fr_CA.lang b/src/main/resources/assets/dimdoors/lang/fr_CA.lang index 49c51735..438280c2 100644 --- a/src/main/resources/assets/dimdoors/lang/fr_CA.lang +++ b/src/main/resources/assets/dimdoors/lang/fr_CA.lang @@ -1,63 +1,79 @@ -itemGroup.dimDoorsCreativeTab=Dimensional Doors +itemGroup.dimensional_doors_creative_tab=Objets Dimensional Doors -tile.doorGold.name=Porte dorée -tile.transientDoor.name=Porte transitoire -tile.dimDoorGold.name=Porte dorée dimensionnelle -tile.doorQuartz.name=Porte de quartz -tile.dimDoorPersonal.name=Porte dimensionnelle personnelle -tile.blockDimWall.name=Étoffe de la réalité -tile.blockAlteredWall.name=Étoffe altérée -tile.blockAncientWall.name=Étoffe ancienne -tile.blockDimWallPerm.name=Étoffe éternelle -tile.dimDoorWarp.name=Porte-raccourci +tile.gold_door.name=Porte dorée +tile.quartz_door.name=Porte de quartz + +tile.dimensional_door.name=Porte dimensionnelle +tile.gold_dimensional_door.name=Porte dorée dimensionnelle +tile.quartz_dimensional_door.name=Porte dimensionnelle personnelle +tile.unstable_dimensional_door.name=Porte instable +tile.warp_dimensional_door.name=Porte-raccourci +tile.dimensional_trapdoor.name=Trappe transdimensionnelle +tile.transient_dimensional_door.name=Porte transitoire + +tile.fabric_reality.name=Étoffe de la réalité +tile.fabric_altered.name=Étoffe altérée +tile.fabric_ancient.name=Étoffe ancienne +tile.fabric_eternal.name=Étoffe éternelle +tile.fabric_unraveled.name=Étoffe effilochée tile.rift.name=Fissure -tile.BlockLimbo.name=Étoffe effilochée -tile.chaosDoor.name=Porte instable -tile.dimDoor.name=Porte dimensionnelle -tile.dimHatch.name=Trappe transdimensionnelle -item.itemGoldDoor.name=Porte dorée -item.itemDDKey=Clé de fissure -item.itemQuartzDoor.name=Porte de quartz -item.itemQuartzDimDoor.name=Porte dimensionnelle personnelle -item.itemGoldDimDoor.name=Porte dorée dimensionnelle -item.itemDimDoor.name=Porte dimensionnelle -item.itemDimDoorWarp.name=Porte-raccourci -item.itemLinkSignature.name=Signature de fissure -item.itemStabilizedRiftSig.name=Signature de fissure stabilisée -item.itemRiftRemover.name=Enleveur de fissure -item.itemStableFabric.name=Étoffe stable -item.itemChaosDoor.name=Porte instable -item.ItemRiftBlade.name=Lame de fissure -item.itemWorldThread.name=Fil du monde +item.gold_door.name=Porte dorée +item.quartz_door.name=Porte de quartz -info.riftkey.bound=Liée -info.riftkey.unbound=Non liée -info.dimDoor0=Placez sur le bloc sous une fissure -info.dimDoor1=pour activer cette fissure ou placez -info.dimDoor2=n'importe où ailleurs pour créer une -info.dimDoor3=dimension de poche. -info.goldDimDoor0=Similaire à une porte dimensionnelle -info.goldDimDoor1=mais garde une dimension de poche -info.goldDimDoor2=chargée si elle est placée à l'intérieur. -info.personalDimDoor0=Crée un passage vers votre -info.personalDimDoor1=dimension de poche personnelle. -info.riftblade0=Ouvre des portes temporaires sur des fissures -info.riftblade1=et possède une attaque de téléporation. -info.riftRemover0=Utilisez près d'une fissure -info.riftRemover1=exposée pour l'enlever ainsi -info.riftRemover2=que celles à proximité. -info.riftSignature.bound=Mène aux coordonnées (%d, %d, %d) à la dimension #%d -info.riftSignature.unbound0=Le premier clic stocke un emplacement ; -info.riftSignature.unbound1=le deuxième clic crée une paire de -info.riftSignature.unbound2=fissures qui lient les deux emplacements. -info.riftSignature.stable0=Le premier clic stocke un emplacement, -info.riftSignature.stable1=les autres clics créent des fissurent qui lient -info.riftSignature.stable2=le premier et les derniers emplacements ensemble. -info.chaosDoor=Attention : mène vers une destination aléatoire -info.warpDoor0=Placez sur le bloc sous une -info.warpDoor1=fissure pour créer un portail, -info.warpDoor2=ou placez n'importe où dans une -info.warpDoor3=dimension de poche pour sortir. +item.dimensional_door.name=Porte dimensionnelle +item.gold_dimensional_door.name=Porte dorée dimensionnelle +item.quartz_dimensional_door.name=Porte dimensionnelle personnelle +item.unstable_dimensional_door.name=Porte instable +item.warp_dimensional_door.name=Porte-raccourci -entity.dimdoors.Monolith.name=Monolithe +item.rift_key=Clé de fissure +item.rift_signature.name=Signature de fissure +item.stabilized_rift_signature.name=Signature de fissure stabilisée +item.rift_connection_tool.name=Below Average Rift Connection Tool +item.rift_remover.name=Enleveur de fissure +item.rift_blade.name=Lame de fissure + +item.world_thread.name=Fil du monde +item.stable_fabric.name=Étoffe stable + +info.rift_key.bound=Liée +info.rift_key.unbound=Non liée + +info.dimensional_door0=Placez sur le bloc sous une fissure +info.dimensional_door1=pour activer cette fissure ou placez +info.dimensional_door2=n'importe où ailleurs pour créer une +info.dimensional_door3=dimension de poche. + +info.gold_dimensional_door0=Similaire à une porte dimensionnelle +info.gold_dimensional_door1=mais garde une dimension de poche +info.gold_dimensional_door2=chargée si elle est placée à l'intérieur. + +info.quartz_dimensional_door0=Crée un passage vers votre +info.quartz_dimensional_door1=dimension de poche personnelle. + +info.rift_blade0=Ouvre des portes temporaires sur des fissures +info.rift_blade1=et possède une attaque de téléporation. + +info.rift_remover0=Utilisez près d'une fissure +info.rift_remover1=exposée pour l'enlever ainsi +info.rift_remover2=que celles à proximité. + +info.rift_signature.bound=Mène aux coordonnées (%d, %d, %d) à la dimension #%d + +info.rift_signature.unbound0=Le premier clic stocke un emplacement ; +info.rift_signature.unbound1=le deuxième clic crée une paire de +info.rift_signature.unbound2=fissures qui lient les deux emplacements. + +info.rift_signature.stable0=Le premier clic stocke un emplacement, +info.rift_signature.stable1=les autres clics créent des fissurent qui lient +info.rift_signature.stable2=le premier et les derniers emplacements ensemble. + +info.unstable_dimensional_door=Attention : mène vers une destination aléatoire + +info.warp_dimensional_door0=Placez sur le bloc sous une +info.warp_dimensional_door1=fissure pour créer un portail, +info.warp_dimensional_door2=ou placez n'importe où dans une +info.warp_dimensional_door3=dimension de poche pour sortir. + +entity.dimdoors.monolith.name=Monolithe \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/lang/it_IT.lang b/src/main/resources/assets/dimdoors/lang/it_IT.lang index 3848d425..29bfd842 100644 --- a/src/main/resources/assets/dimdoors/lang/it_IT.lang +++ b/src/main/resources/assets/dimdoors/lang/it_IT.lang @@ -1,59 +1,79 @@ -itemGroup.dimDoorsCreativeTab=Dimensional Doors oggetti -tile.doorGold.name=Porta d'oro -tile.transientDoor.name=Porta transitoria -tile.dimDoorGold.name=Porta d'oro dimensionale -tile.doorQuartz.name=Porta di quarzo -tile.dimDoorPersonal.name=Porta dimensionale personale -tile.blockDimWall.name=Tessuto della realtà -tile.blockAlteredWall.name=Tessuto alterato -tile.blockAncientWall.name=Tessuto antico -tile.blockDimWallPerm.name=Tessuto eterno -tile.dimDoorWarp.name=Porta distorta +itemGroup.dimensional_doors_creative_tab=Dimensional Doors oggetti + +tile.gold_door.name=Porta d'oro +tile.quartz_door.name=Porta di quarzo + +tile.dimensional_door.name=Porta dimensionale +tile.gold_dimensional_door.name=Porta d'oro dimensionale +tile.quartz_dimensional_door.name=Porta dimensionale personale +tile.unstable_dimensional_door.name=Porta instabile +tile.warp_dimensional_door.name=Porta distorta +tile.dimensional_trapdoor.name=Botola transdimensionale +tile.transient_dimensional_door.name=Porta transitoria + +tile.fabric_reality.name=Tessuto della realtà +tile.fabric_altered.name=Tessuto alterato +tile.fabric_ancient.name=Tessuto antico +tile.fabric_eternal.name=Tessuto eterno +tile.fabric_unraveled.name=Tessuto disfatto tile.rift.name=Frattura -tile.BlockLimbo.name=Tessuto disfatto -tile.chaosDoor.name=Porta instabile -tile.dimDoor.name=Porta dimensionale -tile.dimHatch.name=Botola transdimensionale -item.itemGoldDoor.name=Porta d'oro -item.itemDDKey=Chiave per frattura -item.itemQuartzDoor.name=Porta di quarzo -item.itemQuartzDimDoor.name=Porta dimensionale personale -item.itemGoldDimDoor.name=Porta d'oro dimensionale -item.itemDimDoor.name=Porta dimensionale -item.itemDimDoorWarp.name=Porta distorta -item.itemLinkSignature.name=Segno di frattura -item.itemStabilizedRiftSig.name=Segno di frattura stabilizzato -item.itemRiftRemover.name=Rimovitore di frattura -item.itemStableFabric.name=Tessuto stabile -item.itemChaosDoor.name=Porta instabile -item.ItemRiftBlade.name=Lama dimensionale -item.itemWorldThread.name=Filo di mondo -info.riftkey.bound=Legato -info.riftkey.unbound=Non legato -info.dimDoor0=Piazzalo sul blocco sotto una -info.dimDoor1=frattura per attivarla o piazzalo -info.dimDoor2=da qualunque altra parte per creare -info.dimDoor3=una dimensione tascabile. -info.goldDimDoor0=Simile a una Porta dimensionale -info.goldDimDoor1=ma tiene la dimensione tascabile -info.goldDimDoor2=caricata se piazzata all'interno. -info.personalDimDoor0=Crea un sentiero alla -info.personalDimDoor1=tua dimensione tascabile -info.riftblade0=Apre porte temporanee su fratture -info.riftblade1=e ha un colpo che teletrasporta. -info.riftRemover0=Usalo presso una frattura -info.riftRemover1=esposta per rimuovere quello -info.riftRemover2=e altre fratture vicine. -info.riftSignature.bound=Porta a (%d, %d, %d) nella dimensione #%d -info.riftSignature.unbound0=Al primo clic salva la posizione; al -info.riftSignature.unbound1=secondo clic crea un paio di fratture -info.riftSignature.unbound2=che collegano le due posizioni. -info.riftSignature.stable0=Al primo clic salva la posizione; al -info.riftSignature.stable1=secondo clic crea fratture che -info.riftSignature.stable2=collegano la prima e ultima posizione. -info.chaosDoor=Attenziione: Porta a una destinazione casuale -info.warpDoor0=Piazzalo sul blocco sotto una -info.warpDoor1=frattura per creare un portale, -info.warpDoor2=o piazzalo da qualunque altra parte -info.warpDoor3=in una dimensione tascabile per uscire. -entity.dimdoors.Monolith.name=Monolito + +item.gold_door.name=Porta d'oro +item.quartz_door.name=Porta di quarzo + +item.dimensional_door.name=Porta dimensionale +item.gold_dimensional_door.name=Porta d'oro dimensionale +item.quartz_dimensional_door.name=Porta dimensionale personale +item.unstable_dimensional_door.name=Porta instabile +item.warp_dimensional_door.name=Porta distorta + +item.rift_key=Chiave per frattura +item.rift_signature.name=Segno di frattura +item.stabilized_rift_signature.name=Segno di frattura stabilizzato +item.rift_connection_tool.name=Below Average Rift Connection Tool +item.rift_remover.name=Rimovitore di frattura +item.rift_blade.name=Lama dimensionale + +item.world_thread.name=Filo di mondo +item.stable_fabric.name=Tessuto stabile + +info.rift_key.bound=Legato +info.rift_key.unbound=Non legato + +info.dimensional_door0=Piazzalo sul blocco sotto una +info.dimensional_door1=frattura per attivarla o piazzalo +info.dimensional_door2=da qualunque altra parte per creare +info.dimensional_door3=una dimensione tascabile. + +info.gold_dimensional_door0=Simile a una Porta dimensionale +info.gold_dimensional_door1=ma tiene la dimensione tascabile +info.gold_dimensional_door2=caricata se piazzata all'interno. + +info.quartz_dimensional_door0=Crea un sentiero alla +info.quartz_dimensional_door1=tua dimensione tascabile + +info.rift_blade0=Apre porte temporanee su fratture +info.rift_blade1=e ha un colpo che teletrasporta. + +info.rift_remover0=Usalo presso una frattura +info.rift_remover1=esposta per rimuovere quello +info.rift_remover2=e altre fratture vicine. + +info.rift_signature.bound=Porta a (%d, %d, %d) nella dimensione #%d + +info.rift_signature.unbound0=Al primo clic salva la posizione; al +info.rift_signature.unbound1=secondo clic crea un paio di fratture +info.rift_signature.unbound2=che collegano le due posizioni. + +info.rift_signature.stable0=Al primo clic salva la posizione; al +info.rift_signature.stable1=secondo clic crea fratture che +info.rift_signature.stable2=collegano la prima e ultima posizione. + +info.unstable_dimensional_door=Attenziione: Porta a una destinazione casuale + +info.warp_dimensional_door0=Piazzalo sul blocco sotto una +info.warp_dimensional_door1=frattura per creare un portale, +info.warp_dimensional_door2=o piazzalo da qualunque altra parte +info.warp_dimensional_door3=in una dimensione tascabile per uscire. + +entity.dimdoors.monolith.name=Monolito \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/lang/nl_NL.lang b/src/main/resources/assets/dimdoors/lang/nl_NL.lang index 6cab5484..735c570a 100644 --- a/src/main/resources/assets/dimdoors/lang/nl_NL.lang +++ b/src/main/resources/assets/dimdoors/lang/nl_NL.lang @@ -1,60 +1,79 @@ -itemGroup.dimDoorsCreativeTab=Dimensional Doors Voorwerpen -tile.doorGold.name=Gouden Deur -tile.transientDoor.name=Vergankelijke Deur -tile.dimDoorGold.name=Gouden Dimensiedeur -tile.doorQuartz.name=Kwartsen Deur -tile.dimDoorPersonal.name=Persoonlijke Dimensiedeur -tile.blockFabricReality.name=Werkelijkheidsweefsel -tile.blockFabricAltered.name=Veranderd Weefsel -tile.blockFabricAncient.name=Aloud Weefsel -tile.blockFabricEternal.name=Oneindig Weefsel -tile.blockFabricUnraveled.name=Ontraveld Weefsel -tile.dimDoorWarp.name=Verdraaideur -tile.blockRift.name=Scheur -tile.chaosDoor.name=Chaos Deur -tile.dimDoor.name=Dimensiedeur -tile.blockDimHatch.name=Transdimensionale Valdeur -item.itemDoorGold.name=Gouden Deur -item.itemDDKey=Scheur Sleutel -item.itemDoorQuartz.name=Kwartsen Deur -item.itemDimDoorQuartz.name=Persoonlijke Dimensiedeur -item.itemDimDoorGold.name=Gouden Dimensiedeur -item.itemDimDoor.name=Dimensiedeur -item.itemDimDoorWarp.name=Verdraaideur -item.itemLinkSignature.name=Scheurtekening -item.itemStabilizedRiftSig.name=Gestabiliseerde Scheurtekening -item.itemRiftConnectionTool.name=Ondergemiddeld Scheurverbindingsgereedschap -item.itemRiftRemover.name=Scheurverwijderaar -item.itemStableFabric.name=Stabiel Weefsel -item.itemDimDoorChaos.name=Chaos Deur -item.itemRiftBlade.name=Scheurkling -item.itemWorldThread.name=Werelddraad -info.riftkey.bound=Gebonden -info.riftkey.unbound=Ontbonden -info.dimDoor0=Plaats op het blok onder een scheur -info.dimDoor1=om deze scheur te activeren of -info.dimDoor2=op een andere plaats om een -info.dimDoor3=publieke broekzak-dimensie te creëren. -info.goldDimDoor0=Net als een Dimensiedeur, maar houdt -info.goldDimDoor1=een broekzak dimensie geladen als -info.goldDimDoor2=deze er binnen geplaatst wordt. -info.personalDimDoor0=Creëert een pad naar -info.personalDimDoor1=je persoonlijke broekzak -info.riftblade0=Opent tijdelijke deuren op scheuren -info.riftblade1=en heeft een teleportatie aanval. -info.riftRemover0=Gebruik dichtbij een scheur -info.riftRemover1=om het te verwijderen en -info.riftRemover2=alle dichtbijzijnde scheuren. -info.riftSignature.bound=Leidt naar (%d, %d, %d) in dimensie #%d -info.riftSignature.unbound0=De eerste klik slaat een locatie op; -info.riftSignature.unbound1=de tweede creëert een paar scheuren -info.riftSignature.unbound2=die beide locaties met elkaar verbinden. -info.riftSignature.stable0=De eerste klik slaat een locatie op, -info.riftSignature.stable1=andere klikken creëren scheuren die de eerste -info.riftSignature.stable2=en laatste locaties met elkaar verbinden. -info.chaosDoor=Pas op: Leidt naar een willekeurige bestemming -info.warpDoor0=Plaats op het blok onder een scheur -info.warpDoor1=om een portaal te creëren, -info.warpDoor2=of plaats het ergens in een -info.warpDoor3=broekzak dimensie om deze te verlaten. -entity.dimdoors.Monolith.name=Monoliet \ No newline at end of file +itemGroup.dimensional_doors_creative_tab=Dimensional Doors Voorwerpen + +tile.gold_door.name=Gouden Deur +tile.quartz_door.name=Kwartsen Deur + +tile.dimensional_door.name=Dimensiedeur +tile.gold_dimensional_door.name=Gouden Dimensiedeur +tile.quartz_dimensional_door.name=Persoonlijke Dimensiedeur +tile.unstable_dimensional_door.name=Chaos Deur +tile.warp_dimensional_door.name=Verdraaideur +tile.dimensional_trapdoor.name=Transdimensionale Valdeur +tile.transient_dimensional_door.name=Vergankelijke Deur + +tile.fabric_reality.name=Werkelijkheidsweefsel +tile.fabric_altered.name=Veranderd Weefsel +tile.fabric_ancient.name=Aloud Weefsel +tile.fabric_eternal.name=Oneindig Weefsel +tile.fabric_unraveled.name=Ontraveld Weefsel +tile.rift.name=Scheur + +item.gold_door.name=Golden Door +item.quartz_door.name=Quartz Door + +item.dimensional_door.name=Dimensiedeur +item.gold_dimensional_door.name=Gouden Dimensiedeur +item.quartz_dimensional_door.name=Persoonlijke Dimensiedeur +item.unstable_dimensional_door.name=Chaos Deur +item.warp_dimensional_door.name=Verdraaideur + +item.rift_key=Scheur Sleutel +item.rift_signature.name=Scheurtekening +item.stabilized_rift_signature.name=Gestabiliseerde Scheurtekening +item.rift_connection_tool.name=Ondergemiddeld Scheurverbindingsgereedschap +item.rift_remover.name=Scheurverwijderaar +item.rift_blade.name=Scheurkling + +item.world_thread.name=Werelddraad +item.stable_fabric.name=Stabiel Weefsel + +info.rift_key.bound=Gebonden +info.rift_key.unbound=Ontbonden + +info.dimensional_door0=Plaats op het blok onder een scheur +info.dimensional_door1=om deze scheur te activeren of +info.dimensional_door2=op een andere plaats om een +info.dimensional_door3=publieke broekzak-dimensie te creëren. + +info.gold_dimensional_door0=Net als een Dimensiedeur, maar houdt +info.gold_dimensional_door1=een broekzak dimensie geladen als +info.gold_dimensional_door2=deze er binnen geplaatst wordt. + +info.quartz_dimensional_door0=Creëert een pad naar +info.quartz_dimensional_door1=je persoonlijke broekzak + +info.rift_blade0=Opent tijdelijke deuren op scheuren +info.rift_blade1=en heeft een teleportatie aanval. + +info.rift_remover0=Gebruik dichtbij een scheur +info.rift_remover1=om het te verwijderen en +info.rift_remover2=alle dichtbijzijnde scheuren. + +info.rift_signature.bound=Leidt naar (%d, %d, %d) in dimensie #%d + +info.rift_signature.unbound0=De eerste klik slaat een locatie op; +info.rift_signature.unbound1=de tweede creëert een paar scheuren +info.rift_signature.unbound2=die beide locaties met elkaar verbinden. + +info.rift_signature.stable0=De eerste klik slaat een locatie op, +info.rift_signature.stable1=andere klikken creëren scheuren die de eerste +info.rift_signature.stable2=en laatste locaties met elkaar verbinden. + +info.unstable_dimensional_door=Pas op: Leidt naar een willekeurige bestemming + +info.warp_dimensional_door0=Plaats op het blok onder een scheur +info.warp_dimensional_door1=om een portaal te creëren, +info.warp_dimensional_door2=of plaats het ergens in een +info.warp_dimensional_door3=broekzak dimensie om deze te verlaten. + +entity.dimdoors.monolith.name=Monoliet \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/lang/ru_RU.lang b/src/main/resources/assets/dimdoors/lang/ru_RU.lang index ba3a43b3..a22d65d3 100644 --- a/src/main/resources/assets/dimdoors/lang/ru_RU.lang +++ b/src/main/resources/assets/dimdoors/lang/ru_RU.lang @@ -1,59 +1,79 @@ -itemGroup.dimDoorsCreativeTab=Dimensional Doors: Предметы -tile.doorGold.name=Золотая дверь -tile.transientDoor.name=Временная дверь -tile.dimDoorGold.name=Золотая пространственная дверь -tile.doorQuartz.name=Кварцевая дверь -tile.dimDoorPersonal.name=Личная пространственная дверь -tile.blockDimWall.name=Ткань Мироздания -tile.blockAlteredWall.name=Изменённая ткань -tile.blockAncientWall.name=Древняя ткань -tile.blockDimWallPerm.name=Вечная ткань -tile.dimDoorWarp.name=Дверь искажения +itemGroup.dimensional_doors_creative_tab=Dimensional Doors: Предметы + +tile.gold_door.name=Золотая дверь +tile.quartz_door.name=Кварцевая дверь + +tile.dimensional_door.name=Пространственная дверь +tile.gold_dimensional_door.name=Золотая пространственная дверь +tile.quartz_dimensional_door.name=Личная пространственная дверь +tile.unstable_dimensional_door.name=Нестабильная дверь +tile.warp_dimensional_door.name=Дверь искажения +tile.dimensional_trapdoor.name=Межпространственный люк +tile.transient_dimensional_door.name=Временная дверь + +tile.fabric_reality.name=Ткань Мироздания +tile.fabric_altered.name=Изменённая ткань +tile.fabric_ancient.name=Древняя ткань +tile.fabric_eternal.name=Вечная ткань +tile.fabric_unraveled.name=Распутанная ткань tile.rift.name=Разлом -tile.BlockLimbo.name=Распутанная ткань -tile.chaosDoor.name=Нестабильная дверь -tile.dimDoor.name=Пространственная дверь -tile.dimHatch.name=Межпространственный люк -item.itemGoldDoor.name=Золотая дверь -item.itemDDKey=Ключ разлома -item.itemQuartzDoor.name=Кварцевая дверь -item.itemQuartzDimDoor.name=Личная пространственная дверь -item.itemGoldDimDoor.name=Золотая пространственная дверь -item.itemDimDoor.name=Пространственная дверь -item.itemDimDoorWarp.name=Дверь искажения -item.itemLinkSignature.name=Подписыватель разлома -item.itemStabilizedRiftSig.name=Стабилизированный подписыватель разлома -item.itemRiftRemover.name=Уничтожитель разломов -item.itemStableFabric.name=Стабильная ткань -item.itemChaosDoor.name=Нестабильная дверь -item.ItemRiftBlade.name=Клинок разлома -item.itemWorldThread.name=Мировая нить -info.riftkey.bound=Связан -info.riftkey.unbound=Не связан -info.dimDoor0=Поставьте на блок под разломом, -info.dimDoor1=чтобы активировать этот разлом или -info.dimDoor2=поставьте куда угодно, чтобы создать -info.dimDoor3=карманное измерение. -info.goldDimDoor0=Схожа с пространственной дверью, -info.goldDimDoor1=но она также держит карманное измерение -info.goldDimDoor2=загруженным, если она размещена внутри его. -info.personalDimDoor0=Создает путь к -info.personalDimDoor1=Вашему карману -info.riftblade0=Открывает временные двери на разломах -info.riftblade1=и наносит урон при телепортации. -info.riftRemover0=Используйте рядом с разломом, -info.riftRemover1=чтобы убрать его и -info.riftRemover2=другие ближайшие разломы. -info.riftSignature.bound=Ведёт в (%d, %d, %d) в измерение #%d -info.riftSignature.unbound0=Первое нажатие сохраняет расположение; -info.riftSignature.unbound1=второе нажатие создаёт пару -info.riftSignature.unbound2=разломов, соединяющих два расположения. -info.riftSignature.stable0=Первое нажатие сохраняет расположение, -info.riftSignature.stable1=остальные нажатия создают разломы, соединяющие -info.riftSignature.stable2=первое и последнее расположения вместе. -info.chaosDoor=Внимание: Ведёт неизвестно куда -info.warpDoor0=Поставьте на блок под -info.warpDoor1=разломом, чтобы создать портал -info.warpDoor2=или поставьте куда угодно в -info.warpDoor3=карманном измерении, чтобы выйти из него. -entity.dimdoors.Monolith.name=Монолит + +item.gold_door.name=Золотая дверь +item.quartz_door.name=Кварцевая дверь + +item.dimensional_door.name=Пространственная дверь +item.gold_dimensional_door.name=Золотая пространственная дверь +item.quartz_dimensional_door.name=Личная пространственная дверь +item.unstable_dimensional_door.name=Нестабильная дверь +item.warp_dimensional_door.name=Дверь искажения + +item.rift_key=Ключ разлома +item.rift_signature.name=Подписыватель разлома +item.stabilized_rift_signature.name=Стабилизированный подписыватель разлома +item.rift_connection_tool.name=Below Average Rift Connection Tool +item.rift_remover.name=Уничтожитель разломов +item.rift_blade.name=Клинок разлома + +item.world_thread.name=Мировая нить +item.stable_fabric.name=Стабильная ткань + +info.rift_key.bound=Связан +info.rift_key.unbound=Не связан + +info.dimensional_door0=Поставьте на блок под разломом, +info.dimensional_door1=чтобы активировать этот разлом или +info.dimensional_door2=поставьте куда угодно, чтобы создать +info.dimensional_door3=карманное измерение. + +info.gold_dimensional_door0=Схожа с пространственной дверью, +info.gold_dimensional_door1=но она также держит карманное измерение +info.gold_dimensional_door2=загруженным, если она размещена внутри его. + +info.quartz_dimensional_door0=Создает путь к +info.quartz_dimensional_door1=Вашему карману + +info.rift_blade0=Открывает временные двери на разломах +info.rift_blade1=и наносит урон при телепортации. + +info.rift_remover0=Используйте рядом с разломом, +info.rift_remover1=чтобы убрать его и +info.rift_remover2=другие ближайшие разломы. + +info.rift_signature.bound=Ведёт в (%d, %d, %d) в измерение #%d + +info.rift_signature.unbound0=Первое нажатие сохраняет расположение; +info.rift_signature.unbound1=второе нажатие создаёт пару +info.rift_signature.unbound2=разломов, соединяющих два расположения. + +info.rift_signature.stable0=Первое нажатие сохраняет расположение, +info.rift_signature.stable1=остальные нажатия создают разломы, соединяющие +info.rift_signature.stable2=первое и последнее расположения вместе. + +info.unstable_dimensional_door=Внимание: Ведёт неизвестно куда + +info.warp_dimensional_door0=Поставьте на блок под +info.warp_dimensional_door1=разломом, чтобы создать портал +info.warp_dimensional_door2=или поставьте куда угодно в +info.warp_dimensional_door3=карманном измерении, чтобы выйти из него. + +entity.dimdoors.monolith.name=Монолит \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/lang/zh_CN.lang b/src/main/resources/assets/dimdoors/lang/zh_CN.lang index e5a720eb..c338151f 100644 --- a/src/main/resources/assets/dimdoors/lang/zh_CN.lang +++ b/src/main/resources/assets/dimdoors/lang/zh_CN.lang @@ -1,59 +1,79 @@ -itemGroup.dimDoorsCreativeTab=次元门物品 -tile.doorGold.name=金门 -tile.transientDoor.name=瞬息之门 -tile.dimDoorGold.name=金制次元门 -tile.doorQuartz.name=石英门 -tile.dimDoorPersonal.name=私人次元门 -tile.blockDimWall.name=现实之壁 -tile.blockAlteredWall.name=变化之壁 -tile.blockAncientWall.name=远古之壁 -tile.blockDimWallPerm.name=永恒之壁 -tile.dimDoorWarp.name=扭曲之门 +itemGroup.dimensional_doors_creative_tab=次元门物品 + +tile.gold_door.name=金门 +tile.quartz_door.name=石英门 + +tile.dimensional_door.name=次元门 +tile.gold_dimensional_door.name=金制次元门 +tile.quartz_dimensional_door.name=私人次元门 +tile.unstable_dimensional_door.name=不稳定的门 +tile.warp_dimensional_door.name=扭曲之门 +tile.dimensional_trapdoor.name=空间活板门 +tile.transient_dimensional_door.name=瞬息之门 + +tile.fabric_reality.name=现实之壁 +tile.fabric_altered.name=变化之壁 +tile.fabric_ancient.name=远古之壁 +tile.fabric_eternal.name=永恒之壁 +tile.fabric_unraveled.name=边境之壁 tile.rift.name=裂痕 -tile.BlockLimbo.name=边境之壁 -tile.chaosDoor.name=不稳定的门 -tile.dimDoor.name=次元门 -tile.dimHatch.name=空间活板门 -item.itemGoldDoor.name=金门 -item.itemDDKey=裂痕钥匙 -item.itemQuartzDoor.name=石英门 -item.itemQuartzDimDoor.name=私人次元门 -item.itemGoldDimDoor.name=金制次元门 -item.itemDimDoor.name=次元门 -item.itemDimDoorWarp.name=扭曲之门 -item.itemLinkSignature.name=裂痕印记 -item.itemStabilizedRiftSig.name=裂痕印记(稳定) -item.itemRiftRemover.name=裂痕移除器 -item.itemStableFabric.name=稳定构造 -item.itemChaosDoor.name=不稳定门 -item.ItemRiftBlade.name=裂痕之刃 -item.itemWorldThread.name=世界纤维 -info.riftkey.bound=绑定 -info.riftkey.unbound=取消绑定 -info.dimDoor0=放在裂痕下方的方块上 -info.dimDoor1=来激活裂痕 -info.dimDoor2=或放在任意地点生成 -info.dimDoor3=一个口袋次元. -info.goldDimDoor0=类似于次元门 -info.goldDimDoor1=但它放在次元内部时 -info.goldDimDoor2=会保持次元的加载. -info.personalDimDoor0=生成一个通向你 -info.personalDimDoor1=口袋次元的路径 -info.riftblade0=在裂痕上开启临时的门 -info.riftblade1=它还拥有瞬移攻击的能力. -info.riftRemover0=在外露的裂痕附近使用 -info.riftRemover1=来移除它以及附近的其他 -info.riftRemover2=裂痕. -info.riftSignature.bound=指向(%d, %d, %d) 位于#%d -info.riftSignature.unbound0=第一次点击记录一个位置; -info.riftSignature.unbound1=第二次点击在两地间创造 -info.riftSignature.unbound2=一对相互连接的裂痕. -info.riftSignature.stable0=首次点击记录一个位置, -info.riftSignature.stable1=再次点击生成连接两地的 -info.riftSignature.stable2=裂痕. -info.chaosDoor=注意: 将会随机传送 -info.warpDoor0=放在裂痕下方的方块上 -info.warpDoor1=来制造传送门, -info.warpDoor2=放在口袋次元中 -info.warpDoor3=以退出空间. -entity.dimdoors.Monolith.name=巨石 + +item.gold_door.name=金门 +item.quartz_door.name=石英门 + +item.dimensional_door.name=次元门 +item.gold_dimensional_door.name=金制次元门 +item.quartz_dimensional_door.name=私人次元门 +item.unstable_dimensional_door.name=不稳定的门 +item.warp_dimensional_door.name=扭曲之门 + +item.rift_key=裂痕钥匙 +item.rift_signature.name=裂痕印记 +item.stabilized_rift_signature.name=裂痕印记(稳定) +item.rift_connection_tool.name=Below Average Rift Connection Tool +item.rift_remover.name=裂痕移除器 +item.rift_blade.name=裂痕之刃 + +item.world_thread.name=世界纤维 +item.stable_fabric.name=稳定构造 + +info.rift_key.bound=绑定 +info.rift_key.unbound=取消绑定 + +info.dimensional_door0=放在裂痕下方的方块上 +info.dimensional_door1=来激活裂痕 +info.dimensional_door2=或放在任意地点生成 +info.dimensional_door3=一个口袋次元. + +info.gold_dimensional_door0=类似于次元门 +info.gold_dimensional_door1=但它放在次元内部时 +info.gold_dimensional_door2=会保持次元的加载. + +info.quartz_dimensional_door0=生成一个通向你 +info.quartz_dimensional_door1=口袋次元的路径 + +info.rift_blade0=在裂痕上开启临时的门 +info.rift_blade1=它还拥有瞬移攻击的能力. + +info.rift_remover0=在外露的裂痕附近使用 +info.rift_remover1=来移除它以及附近的其他 +info.rift_remover2=裂痕. + +info.rift_signature.bound=指向(%d, %d, %d) 位于#%d + +info.rift_signature.unbound0=第一次点击记录一个位置; +info.rift_signature.unbound1=第二次点击在两地间创造 +info.rift_signature.unbound2=一对相互连接的裂痕. + +info.rift_signature.stable0=首次点击记录一个位置, +info.rift_signature.stable1=再次点击生成连接两地的 +info.rift_signature.stable2=裂痕. + +info.unstable_dimensional_door=注意: 将会随机传送 + +info.warp_dimensional_door0=放在裂痕下方的方块上 +info.warp_dimensional_door1=来制造传送门, +info.warp_dimensional_door2=放在口袋次元中 +info.warp_dimensional_door3=以退出空间. + +entity.dimdoors.monolith.name=巨石 \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_bottom.json b/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_bottom.json deleted file mode 100644 index 1649b02f..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "dimdoors:blocks/blockDimDoorWarp_lower", - "top": "dimdoors:blocks/blockDimDoorWarp_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_bottom_rh.json deleted file mode 100644 index faebdb92..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "dimdoors:blocks/blockDimDoorWarp_lower", - "top": "dimdoors:blocks/blockDimDoorWarp_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_top.json b/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_top.json deleted file mode 100644 index b12a640e..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "dimdoors:blocks/blockDimDoorWarp_lower", - "top": "dimdoors:blocks/blockDimDoorWarp_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_top_rh.json b/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_top_rh.json deleted file mode 100644 index 3b79dffc..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoorWarp_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "dimdoors:blocks/blockDimDoorWarp_lower", - "top": "dimdoors:blocks/blockDimDoorWarp_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoor_bottom.json b/src/main/resources/assets/dimdoors/models/block/blockDimDoor_bottom.json deleted file mode 100644 index a5632b64..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoor_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "dimdoors:blocks/blockDimDoor_lower", - "top": "dimdoors:blocks/blockDimDoor_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoor_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/blockDimDoor_bottom_rh.json deleted file mode 100644 index 8640574a..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoor_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "dimdoors:blocks/blockDimDoor_lower", - "top": "dimdoors:blocks/blockDimDoor_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoor_top.json b/src/main/resources/assets/dimdoors/models/block/blockDimDoor_top.json deleted file mode 100644 index 9c15316a..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoor_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "dimdoors:blocks/blockDimDoor_lower", - "top": "dimdoors:blocks/blockDimDoor_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoor_top_rh.json b/src/main/resources/assets/dimdoors/models/block/blockDimDoor_top_rh.json deleted file mode 100644 index 418056ca..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoor_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "dimdoors:blocks/blockDimDoor_lower", - "top": "dimdoors:blocks/blockDimDoor_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDoorGold_bottom.json b/src/main/resources/assets/dimdoors/models/block/blockDoorGold_bottom.json deleted file mode 100644 index 15584923..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDoorGold_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "dimdoors:blocks/blockDoorGold_lower", - "top": "dimdoors:blocks/blockDoorGold_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDoorGold_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/blockDoorGold_bottom_rh.json deleted file mode 100644 index 187386ab..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDoorGold_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "dimdoors:blocks/blockDoorGold_lower", - "top": "dimdoors:blocks/blockDoorGold_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDoorGold_top.json b/src/main/resources/assets/dimdoors/models/block/blockDoorGold_top.json deleted file mode 100644 index 4221ae6b..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDoorGold_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "dimdoors:blocks/blockDoorGold_lower", - "top": "dimdoors:blocks/blockDoorGold_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDoorGold_top_rh.json b/src/main/resources/assets/dimdoors/models/block/blockDoorGold_top_rh.json deleted file mode 100644 index d7ac8bb6..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDoorGold_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "dimdoors:blocks/blockDoorGold_lower", - "top": "dimdoors:blocks/blockDoorGold_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_bottom.json b/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_bottom.json deleted file mode 100644 index 64d45c51..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "dimdoors:blocks/blockDoorQuartz_lower", - "top": "dimdoors:blocks/blockDoorQuartz_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_bottom_rh.json deleted file mode 100644 index 04e407e8..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "dimdoors:blocks/blockDoorQuartz_lower", - "top": "dimdoors:blocks/blockDoorQuartz_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_top.json b/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_top.json deleted file mode 100644 index 7781e8b1..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "dimdoors:blocks/blockDoorQuartz_lower", - "top": "dimdoors:blocks/blockDoorQuartz_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_top_rh.json b/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_top_rh.json deleted file mode 100644 index f0b1c7a1..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockDoorQuartz_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "dimdoors:blocks/blockDoorQuartz_lower", - "top": "dimdoors:blocks/blockDoorQuartz_upper" - } -} diff --git a/src/main/resources/assets/dimdoors/models/block/blockFabricAltered.json b/src/main/resources/assets/dimdoors/models/block/blockFabricAltered.json deleted file mode 100644 index a04f0b74..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockFabricAltered.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { "all": "dimdoors:blocks/blockFabricAltered" } -} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/blockFabricAncient.json b/src/main/resources/assets/dimdoors/models/block/blockFabricAncient.json deleted file mode 100644 index 5d284512..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockFabricAncient.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { "all": "dimdoors:blocks/blockFabricAncient" } -} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/blockFabricEternal.json b/src/main/resources/assets/dimdoors/models/block/blockFabricEternal.json deleted file mode 100644 index 2636c181..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockFabricEternal.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { "all": "dimdoors:blocks/blockFabricEternal" } -} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/blockFabricReality.json b/src/main/resources/assets/dimdoors/models/block/blockFabricReality.json deleted file mode 100644 index 4645ffd4..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockFabricReality.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { "all": "dimdoors:blocks/blockFabricReality" } -} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/blockFabricUnraveled.json b/src/main/resources/assets/dimdoors/models/block/blockFabricUnraveled.json deleted file mode 100644 index 71985e44..00000000 --- a/src/main/resources/assets/dimdoors/models/block/blockFabricUnraveled.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { "all": "dimdoors:blocks/blockFabricUnraveled" } -} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/dimensional_door_bottom.json b/src/main/resources/assets/dimdoors/models/block/dimensional_door_bottom.json new file mode 100644 index 00000000..8c5dd1b2 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/dimensional_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "dimdoors:blocks/dimensional_door_lower", + "top": "dimdoors:blocks/dimensional_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/dimensional_door_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/dimensional_door_bottom_rh.json new file mode 100644 index 00000000..ec656de7 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/dimensional_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "dimdoors:blocks/dimensional_door_lower", + "top": "dimdoors:blocks/dimensional_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/dimensional_door_top.json b/src/main/resources/assets/dimdoors/models/block/dimensional_door_top.json new file mode 100644 index 00000000..573f71b7 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/dimensional_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "dimdoors:blocks/dimensional_door_lower", + "top": "dimdoors:blocks/dimensional_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/dimensional_door_top_rh.json b/src/main/resources/assets/dimdoors/models/block/dimensional_door_top_rh.json new file mode 100644 index 00000000..f7316528 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/dimensional_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "dimdoors:blocks/dimensional_door_lower", + "top": "dimdoors:blocks/dimensional_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimHatch_bottom.json b/src/main/resources/assets/dimdoors/models/block/dimensional_trapdoor_bottom.json similarity index 53% rename from src/main/resources/assets/dimdoors/models/block/blockDimHatch_bottom.json rename to src/main/resources/assets/dimdoors/models/block/dimensional_trapdoor_bottom.json index 496db19b..42a44828 100644 --- a/src/main/resources/assets/dimdoors/models/block/blockDimHatch_bottom.json +++ b/src/main/resources/assets/dimdoors/models/block/dimensional_trapdoor_bottom.json @@ -1,6 +1,6 @@ { "parent": "block/trapdoor_bottom", "textures": { - "texture": "dimdoors:blocks/blockDimHatch" + "texture": "dimdoors:blocks/dimensional_trapdoor" } } diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimHatch_open.json b/src/main/resources/assets/dimdoors/models/block/dimensional_trapdoor_open.json similarity index 52% rename from src/main/resources/assets/dimdoors/models/block/blockDimHatch_open.json rename to src/main/resources/assets/dimdoors/models/block/dimensional_trapdoor_open.json index 783c4ac0..87efc0c4 100644 --- a/src/main/resources/assets/dimdoors/models/block/blockDimHatch_open.json +++ b/src/main/resources/assets/dimdoors/models/block/dimensional_trapdoor_open.json @@ -1,6 +1,6 @@ { "parent": "block/trapdoor_open", "textures": { - "texture": "dimdoors:blocks/blockDimHatch" + "texture": "dimdoors:blocks/dimensional_trapdoor" } } diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimHatch_top.json b/src/main/resources/assets/dimdoors/models/block/dimensional_trapdoor_top.json similarity index 52% rename from src/main/resources/assets/dimdoors/models/block/blockDimHatch_top.json rename to src/main/resources/assets/dimdoors/models/block/dimensional_trapdoor_top.json index 15cca815..6fbda6d1 100644 --- a/src/main/resources/assets/dimdoors/models/block/blockDimHatch_top.json +++ b/src/main/resources/assets/dimdoors/models/block/dimensional_trapdoor_top.json @@ -1,6 +1,6 @@ { "parent": "block/trapdoor_top", "textures": { - "texture": "dimdoors:blocks/blockDimHatch" + "texture": "dimdoors:blocks/dimensional_trapdoor" } } diff --git a/src/main/resources/assets/dimdoors/models/block/fabric_altered.json b/src/main/resources/assets/dimdoors/models/block/fabric_altered.json new file mode 100644 index 00000000..22c7b6ee --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/fabric_altered.json @@ -0,0 +1,4 @@ +{ + "parent": "block/cube_all", + "textures": { "all": "dimdoors:blocks/fabric_altered" } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/fabric_ancient.json b/src/main/resources/assets/dimdoors/models/block/fabric_ancient.json new file mode 100644 index 00000000..cb864180 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/fabric_ancient.json @@ -0,0 +1,4 @@ +{ + "parent": "block/cube_all", + "textures": { "all": "dimdoors:blocks/fabric_ancient" } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/fabric_eternal.json b/src/main/resources/assets/dimdoors/models/block/fabric_eternal.json new file mode 100644 index 00000000..2a78e70b --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/fabric_eternal.json @@ -0,0 +1,4 @@ +{ + "parent": "block/cube_all", + "textures": { "all": "dimdoors:blocks/fabric_eternal" } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/fabric_reality.json b/src/main/resources/assets/dimdoors/models/block/fabric_reality.json new file mode 100644 index 00000000..7301f2f5 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/fabric_reality.json @@ -0,0 +1,4 @@ +{ + "parent": "block/cube_all", + "textures": { "all": "dimdoors:blocks/fabric_reality" } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/fabric_unraveled.json b/src/main/resources/assets/dimdoors/models/block/fabric_unraveled.json new file mode 100644 index 00000000..190487f9 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/fabric_unraveled.json @@ -0,0 +1,4 @@ +{ + "parent": "block/cube_all", + "textures": { "all": "dimdoors:blocks/fabric_unraveled" } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/block/gold_door_bottom.json b/src/main/resources/assets/dimdoors/models/block/gold_door_bottom.json new file mode 100644 index 00000000..974d7a17 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/gold_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "dimdoors:blocks/gold_door_lower", + "top": "dimdoors:blocks/gold_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/gold_door_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/gold_door_bottom_rh.json new file mode 100644 index 00000000..f51f5982 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/gold_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "dimdoors:blocks/gold_door_lower", + "top": "dimdoors:blocks/gold_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/gold_door_top.json b/src/main/resources/assets/dimdoors/models/block/gold_door_top.json new file mode 100644 index 00000000..a293352b --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/gold_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "dimdoors:blocks/gold_door_lower", + "top": "dimdoors:blocks/gold_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/gold_door_top_rh.json b/src/main/resources/assets/dimdoors/models/block/gold_door_top_rh.json new file mode 100644 index 00000000..4c0e226c --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/gold_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "dimdoors:blocks/gold_door_lower", + "top": "dimdoors:blocks/gold_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/noTexture.json b/src/main/resources/assets/dimdoors/models/block/no_texture.json similarity index 100% rename from src/main/resources/assets/dimdoors/models/block/noTexture.json rename to src/main/resources/assets/dimdoors/models/block/no_texture.json diff --git a/src/main/resources/assets/dimdoors/models/block/quartz_door_bottom.json b/src/main/resources/assets/dimdoors/models/block/quartz_door_bottom.json new file mode 100644 index 00000000..eccbc75f --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/quartz_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "dimdoors:blocks/quartz_door_lower", + "top": "dimdoors:blocks/quartz_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/quartz_door_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/quartz_door_bottom_rh.json new file mode 100644 index 00000000..e38f8e96 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/quartz_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "dimdoors:blocks/quartz_door_lower", + "top": "dimdoors:blocks/quartz_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/quartz_door_top.json b/src/main/resources/assets/dimdoors/models/block/quartz_door_top.json new file mode 100644 index 00000000..0512b494 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/quartz_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "dimdoors:blocks/quartz_door_lower", + "top": "dimdoors:blocks/quartz_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/quartz_door_top_rh.json b/src/main/resources/assets/dimdoors/models/block/quartz_door_top_rh.json new file mode 100644 index 00000000..7b7494f6 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/quartz_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "dimdoors:blocks/quartz_door_lower", + "top": "dimdoors:blocks/quartz_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_bottom.json b/src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_bottom.json similarity index 62% rename from src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_bottom.json rename to src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_bottom.json index 6ef344dd..4a3def07 100644 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_bottom.json +++ b/src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_bottom.json @@ -2,6 +2,6 @@ "parent": "block/door_bottom", "textures": { "bottom": "blocks/door_iron_lower", - "top": "dimdoors:blocks/blockDimDoorChaos_upper" + "top": "dimdoors:blocks/unstable_dimensional_door_upper" } } diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_bottom_rh.json similarity index 62% rename from src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_bottom_rh.json rename to src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_bottom_rh.json index b1e9d090..8f6c827b 100644 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_bottom_rh.json +++ b/src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_bottom_rh.json @@ -2,6 +2,6 @@ "parent": "block/door_bottom_rh", "textures": { "bottom": "blocks/door_iron_lower", - "top": "dimdoors:blocks/blockDimDoorChaos_upper" + "top": "dimdoors:blocks/unstable_dimensional_door_upper" } } diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_top.json b/src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_top.json similarity index 61% rename from src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_top.json rename to src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_top.json index d6d1ac74..a3ee4dff 100644 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_top.json +++ b/src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_top.json @@ -2,6 +2,6 @@ "parent": "block/door_top", "textures": { "bottom": "blocks/door_iron_lower", - "top": "dimdoors:blocks/blockDimDoorChaos_upper" + "top": "dimdoors:blocks/unstable_dimensional_door_upper" } } diff --git a/src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_top_rh.json b/src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_top_rh.json similarity index 62% rename from src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_top_rh.json rename to src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_top_rh.json index 06f0d4e0..c9f9ec34 100644 --- a/src/main/resources/assets/dimdoors/models/block/blockDimDoorChaos_top_rh.json +++ b/src/main/resources/assets/dimdoors/models/block/unstable_dimensional_door_top_rh.json @@ -2,6 +2,6 @@ "parent": "block/door_top_rh", "textures": { "bottom": "blocks/door_iron_lower", - "top": "dimdoors:blocks/blockDimDoorChaos_upper" + "top": "dimdoors:blocks/unstable_dimensional_door_upper" } } diff --git a/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_bottom.json b/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_bottom.json new file mode 100644 index 00000000..73198021 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "dimdoors:blocks/warp_dimensional_door_lower", + "top": "dimdoors:blocks/warp_dimensional_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_bottom_rh.json new file mode 100644 index 00000000..2116597c --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "dimdoors:blocks/warp_dimensional_door_lower", + "top": "dimdoors:blocks/warp_dimensional_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_top.json b/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_top.json new file mode 100644 index 00000000..d31bc984 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "dimdoors:blocks/warp_dimensional_door_lower", + "top": "dimdoors:blocks/warp_dimensional_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_top_rh.json b/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_top_rh.json new file mode 100644 index 00000000..0fbad6b1 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/warp_dimensional_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "dimdoors:blocks/warp_dimensional_door_lower", + "top": "dimdoors:blocks/warp_dimensional_door_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/item/blockDimHatch.json b/src/main/resources/assets/dimdoors/models/item/blockDimHatch.json deleted file mode 100644 index 9f40d5ab..00000000 --- a/src/main/resources/assets/dimdoors/models/item/blockDimHatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "dimdoors:block/blockDimHatch_bottom" -} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/item/blockFabricUnraveled.json b/src/main/resources/assets/dimdoors/models/item/blockFabricUnraveled.json deleted file mode 100644 index f594c608..00000000 --- a/src/main/resources/assets/dimdoors/models/item/blockFabricUnraveled.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "dimdoors:block/blockFabricUnraveled", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/item/itemDimDoorGold.json b/src/main/resources/assets/dimdoors/models/item/dimensional_door.json similarity index 88% rename from src/main/resources/assets/dimdoors/models/item/itemDimDoorGold.json rename to src/main/resources/assets/dimdoors/models/item/dimensional_door.json index 840d0578..f63ae39e 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemDimDoorGold.json +++ b/src/main/resources/assets/dimdoors/models/item/dimensional_door.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "dimdoors:items/itemDimDoorGold" + "layer0": "dimdoors:items/dimensional_door" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/dimdoors/models/item/dimensional_trapdoor.json b/src/main/resources/assets/dimdoors/models/item/dimensional_trapdoor.json new file mode 100644 index 00000000..cff98a2b --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/dimensional_trapdoor.json @@ -0,0 +1,3 @@ +{ + "parent": "dimdoors:block/dimensional_trapdoor_bottom" +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/item/blockFabricReality.json b/src/main/resources/assets/dimdoors/models/item/fabric_altered.json similarity index 76% rename from src/main/resources/assets/dimdoors/models/item/blockFabricReality.json rename to src/main/resources/assets/dimdoors/models/item/fabric_altered.json index 81effe14..09699624 100644 --- a/src/main/resources/assets/dimdoors/models/item/blockFabricReality.json +++ b/src/main/resources/assets/dimdoors/models/item/fabric_altered.json @@ -1,5 +1,5 @@ { - "parent": "dimdoors:block/blockFabricReality", + "parent": "dimdoors:block/fabric_altered", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/dimdoors/models/item/blockFabricAltered.json b/src/main/resources/assets/dimdoors/models/item/fabric_ancient.json similarity index 76% rename from src/main/resources/assets/dimdoors/models/item/blockFabricAltered.json rename to src/main/resources/assets/dimdoors/models/item/fabric_ancient.json index 70a3048c..6ba76017 100644 --- a/src/main/resources/assets/dimdoors/models/item/blockFabricAltered.json +++ b/src/main/resources/assets/dimdoors/models/item/fabric_ancient.json @@ -1,5 +1,5 @@ { - "parent": "dimdoors:block/blockFabricAltered", + "parent": "dimdoors:block/fabric_ancient", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/dimdoors/models/item/blockFabricAncient.json b/src/main/resources/assets/dimdoors/models/item/fabric_eternal.json similarity index 76% rename from src/main/resources/assets/dimdoors/models/item/blockFabricAncient.json rename to src/main/resources/assets/dimdoors/models/item/fabric_eternal.json index ed360475..6261fa85 100644 --- a/src/main/resources/assets/dimdoors/models/item/blockFabricAncient.json +++ b/src/main/resources/assets/dimdoors/models/item/fabric_eternal.json @@ -1,5 +1,5 @@ { - "parent": "dimdoors:block/blockFabricAncient", + "parent": "dimdoors:block/fabric_eternal", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/dimdoors/models/item/blockFabricEternal.json b/src/main/resources/assets/dimdoors/models/item/fabric_reality.json similarity index 76% rename from src/main/resources/assets/dimdoors/models/item/blockFabricEternal.json rename to src/main/resources/assets/dimdoors/models/item/fabric_reality.json index 6934b772..8440c5b1 100644 --- a/src/main/resources/assets/dimdoors/models/item/blockFabricEternal.json +++ b/src/main/resources/assets/dimdoors/models/item/fabric_reality.json @@ -1,5 +1,5 @@ { - "parent": "dimdoors:block/blockFabricEternal", + "parent": "dimdoors:block/fabric_reality", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/dimdoors/models/item/fabric_unraveled.json b/src/main/resources/assets/dimdoors/models/item/fabric_unraveled.json new file mode 100644 index 00000000..cfa25d96 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/fabric_unraveled.json @@ -0,0 +1,10 @@ +{ + "parent": "dimdoors:block/fabric_unraveled", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/item/itemDimDoorChaos.json b/src/main/resources/assets/dimdoors/models/item/gold_dimensional_door.json similarity index 87% rename from src/main/resources/assets/dimdoors/models/item/itemDimDoorChaos.json rename to src/main/resources/assets/dimdoors/models/item/gold_dimensional_door.json index 7b41e7ef..aa553eb8 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemDimDoorChaos.json +++ b/src/main/resources/assets/dimdoors/models/item/gold_dimensional_door.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "dimdoors:items/itemDimDoorChaos" + "layer0": "dimdoors:items/gold_dimensional_door" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/dimdoors/models/item/itemDimDoor.json b/src/main/resources/assets/dimdoors/models/item/gold_door.json similarity index 89% rename from src/main/resources/assets/dimdoors/models/item/itemDimDoor.json rename to src/main/resources/assets/dimdoors/models/item/gold_door.json index b979536f..3f9cbc43 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemDimDoor.json +++ b/src/main/resources/assets/dimdoors/models/item/gold_door.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "dimdoors:items/itemDimDoor" + "layer0": "dimdoors:items/gold_door" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/dimdoors/models/item/itemRiftConnectionTool.json b/src/main/resources/assets/dimdoors/models/item/itemRiftConnectionTool.json deleted file mode 100644 index 00b2f072..00000000 --- a/src/main/resources/assets/dimdoors/models/item/itemRiftConnectionTool.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "dimdoors:items/itemRiftConnectionTool" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} diff --git a/src/main/resources/assets/dimdoors/models/item/itemStableFabric.json b/src/main/resources/assets/dimdoors/models/item/itemStableFabric.json deleted file mode 100644 index 65c6644d..00000000 --- a/src/main/resources/assets/dimdoors/models/item/itemStableFabric.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "dimdoors:items/itemStableFabric" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} diff --git a/src/main/resources/assets/dimdoors/models/item/itemWorldThread.json b/src/main/resources/assets/dimdoors/models/item/itemWorldThread.json deleted file mode 100644 index 349ca6c8..00000000 --- a/src/main/resources/assets/dimdoors/models/item/itemWorldThread.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "dimdoors:items/itemWorldThread" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} diff --git a/src/main/resources/assets/dimdoors/models/item/itemRiftRemover.json b/src/main/resources/assets/dimdoors/models/item/link_signature.json similarity index 53% rename from src/main/resources/assets/dimdoors/models/item/itemRiftRemover.json rename to src/main/resources/assets/dimdoors/models/item/link_signature.json index 1138dbc2..07863314 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemRiftRemover.json +++ b/src/main/resources/assets/dimdoors/models/item/link_signature.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "dimdoors:items/itemRiftRemover" + "layer0": "dimdoors:items/link_signature" } } diff --git a/src/main/resources/assets/dimdoors/models/item/quartz_dimensional_door.json b/src/main/resources/assets/dimdoors/models/item/quartz_dimensional_door.json new file mode 100644 index 00000000..1daddaef --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/quartz_dimensional_door.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "dimdoors:items/quartz_dimensional_door" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/dimdoors/models/item/itemDoorGold.json b/src/main/resources/assets/dimdoors/models/item/quartz_door.json similarity index 89% rename from src/main/resources/assets/dimdoors/models/item/itemDoorGold.json rename to src/main/resources/assets/dimdoors/models/item/quartz_door.json index 4c3dcc45..475bde80 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemDoorGold.json +++ b/src/main/resources/assets/dimdoors/models/item/quartz_door.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "dimdoors:items/itemDoorGold" + "layer0": "dimdoors:items/quartz_door" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/dimdoors/models/item/blockDimDoorTransient.json b/src/main/resources/assets/dimdoors/models/item/rift.json similarity index 100% rename from src/main/resources/assets/dimdoors/models/item/blockDimDoorTransient.json rename to src/main/resources/assets/dimdoors/models/item/rift.json diff --git a/src/main/resources/assets/dimdoors/models/item/itemRiftBlade.json b/src/main/resources/assets/dimdoors/models/item/rift_blade.json similarity index 54% rename from src/main/resources/assets/dimdoors/models/item/itemRiftBlade.json rename to src/main/resources/assets/dimdoors/models/item/rift_blade.json index 436bbb90..5a309acc 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemRiftBlade.json +++ b/src/main/resources/assets/dimdoors/models/item/rift_blade.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "dimdoors:items/itemRiftBlade" + "layer0": "dimdoors:items/rift_blade" } } diff --git a/src/main/resources/assets/dimdoors/models/item/itemDimDoorQuartz.json b/src/main/resources/assets/dimdoors/models/item/rift_connection_tool.json similarity index 87% rename from src/main/resources/assets/dimdoors/models/item/itemDimDoorQuartz.json rename to src/main/resources/assets/dimdoors/models/item/rift_connection_tool.json index 7847450e..18fe8206 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemDimDoorQuartz.json +++ b/src/main/resources/assets/dimdoors/models/item/rift_connection_tool.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "dimdoors:items/itemDimDoorQuartz" + "layer0": "dimdoors:items/rift_connection_tool" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/dimdoors/models/item/itemLinkSignature.json b/src/main/resources/assets/dimdoors/models/item/rift_remover.json similarity index 51% rename from src/main/resources/assets/dimdoors/models/item/itemLinkSignature.json rename to src/main/resources/assets/dimdoors/models/item/rift_remover.json index 7eecb983..147c0fc7 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemLinkSignature.json +++ b/src/main/resources/assets/dimdoors/models/item/rift_remover.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "dimdoors:items/itemLinkSignature" + "layer0": "dimdoors:items/rift_remover" } } diff --git a/src/main/resources/assets/dimdoors/models/item/itemStabilizedRiftSig.json b/src/main/resources/assets/dimdoors/models/item/stabilized_rift_sig.json similarity index 50% rename from src/main/resources/assets/dimdoors/models/item/itemStabilizedRiftSig.json rename to src/main/resources/assets/dimdoors/models/item/stabilized_rift_sig.json index 6335baf4..01008400 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemStabilizedRiftSig.json +++ b/src/main/resources/assets/dimdoors/models/item/stabilized_rift_sig.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "dimdoors:items/itemStablizedRiftSig" + "layer0": "dimdoors:items/stabilized_rift_sig" } } diff --git a/src/main/resources/assets/dimdoors/models/item/itemDoorQuartz.json b/src/main/resources/assets/dimdoors/models/item/stable_fabric.json similarity index 88% rename from src/main/resources/assets/dimdoors/models/item/itemDoorQuartz.json rename to src/main/resources/assets/dimdoors/models/item/stable_fabric.json index 8be46660..bc45e502 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemDoorQuartz.json +++ b/src/main/resources/assets/dimdoors/models/item/stable_fabric.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "dimdoors:items/itemDoorQuartz" + "layer0": "dimdoors:items/stable_fabric" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/dimdoors/models/item/blockRift.json b/src/main/resources/assets/dimdoors/models/item/transient_dimensional_door.json similarity index 100% rename from src/main/resources/assets/dimdoors/models/item/blockRift.json rename to src/main/resources/assets/dimdoors/models/item/transient_dimensional_door.json diff --git a/src/main/resources/assets/dimdoors/models/item/unstable_dimensional_door.json b/src/main/resources/assets/dimdoors/models/item/unstable_dimensional_door.json new file mode 100644 index 00000000..b5464d6d --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/unstable_dimensional_door.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "dimdoors:items/unstable_dimensional_door" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/dimdoors/models/item/warp_dimensional_door.json b/src/main/resources/assets/dimdoors/models/item/warp_dimensional_door.json new file mode 100644 index 00000000..551ccf21 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/warp_dimensional_door.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "dimdoors:items/warp_dimensional_door" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/dimdoors/models/item/itemDimDoorWarp.json b/src/main/resources/assets/dimdoors/models/item/world_thread.json similarity index 88% rename from src/main/resources/assets/dimdoors/models/item/itemDimDoorWarp.json rename to src/main/resources/assets/dimdoors/models/item/world_thread.json index 5241749e..de2bb5b9 100644 --- a/src/main/resources/assets/dimdoors/models/item/itemDimDoorWarp.json +++ b/src/main/resources/assets/dimdoors/models/item/world_thread.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "dimdoors:items/itemDimDoorWarp" + "layer0": "dimdoors:items/world_thread" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/dimdoors/pockets/json/defaultDungeonNether.json b/src/main/resources/assets/dimdoors/pockets/json/default_dungeon_nether.json similarity index 100% rename from src/main/resources/assets/dimdoors/pockets/json/defaultDungeonNether.json rename to src/main/resources/assets/dimdoors/pockets/json/default_dungeon_nether.json diff --git a/src/main/resources/assets/dimdoors/pockets/json/defaultDungeonNormal.json b/src/main/resources/assets/dimdoors/pockets/json/default_dungeon_normal.json similarity index 100% rename from src/main/resources/assets/dimdoors/pockets/json/defaultDungeonNormal.json rename to src/main/resources/assets/dimdoors/pockets/json/default_dungeon_normal.json diff --git a/src/main/resources/assets/dimdoors/pockets/json/defaultPrivate.json b/src/main/resources/assets/dimdoors/pockets/json/default_private.json similarity index 100% rename from src/main/resources/assets/dimdoors/pockets/json/defaultPrivate.json rename to src/main/resources/assets/dimdoors/pockets/json/default_private.json diff --git a/src/main/resources/assets/dimdoors/pockets/json/defaultPublic.json b/src/main/resources/assets/dimdoors/pockets/json/default_public.json similarity index 100% rename from src/main/resources/assets/dimdoors/pockets/json/defaultPublic.json rename to src/main/resources/assets/dimdoors/pockets/json/default_public.json diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_0.schem b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_0.schem index d84240f6..2f2c6dd8 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_0.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_0.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_1.schem b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_1.schem index 8978c575..f692d5d9 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_1.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_1.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_2.schem b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_2.schem index 08bde15b..1bd3e0ca 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_2.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_2.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_3.schem b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_3.schem index cc644186..08e55def 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_3.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_3.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_4.schem b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_4.schem index fecb180e..c0c8d50d 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_4.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_4.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_5.schem b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_5.schem index fbe86fe4..50ea3f68 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_5.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_5.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_6.schem b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_6.schem index e30ec4ae..ed8abfd0 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_6.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_6.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_7.schem b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_7.schem index 9d962876..8d40cbff 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_7.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/private/defaultPrivate_7.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_0.schem b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_0.schem index 9ec4e030..0b5437d1 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_0.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_0.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_1.schem b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_1.schem index f92e1a38..16c6917f 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_1.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_1.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_2.schem b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_2.schem index c0c31b28..3d395893 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_2.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_2.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_3.schem b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_3.schem index 79512f46..d50d153d 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_3.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_3.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_4.schem b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_4.schem index 0ce7d068..d3bd7f54 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_4.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_4.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_5.schem b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_5.schem index 5449f3b6..491b3913 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_5.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_5.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_6.schem b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_6.schem index 12b55f46..c6a10225 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_6.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_6.schem differ diff --git a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_7.schem b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_7.schem index f4420660..a2525cad 100644 Binary files a/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_7.schem and b/src/main/resources/assets/dimdoors/pockets/schematic/public/defaultPublic_7.schem differ diff --git a/src/main/resources/assets/dimdoors/sounds.json b/src/main/resources/assets/dimdoors/sounds.json index d667e0f7..14d08315 100644 --- a/src/main/resources/assets/dimdoors/sounds.json +++ b/src/main/resources/assets/dimdoors/sounds.json @@ -1,15 +1,15 @@ { "crack" : { "sounds" : [ "dimdoors:crack"] }, "creepy" : { "sounds" : ["dimdoors:creepy" ] }, - "doorLocked": { "sounds": [ "dimdoors:doorLocked" ] }, - "doorLockRemoved": { "sounds": [ "dimdoors:doorLockRemoved" ] }, - "keyLock" : { "sounds" : [ "dimdoors:keyLock" ] }, - "keyUnlock" : { "sounds": [ "dimdoors:keyUnlock" ] }, + "doorLocked": { "sounds": [ "dimdoors:door_locked" ] }, + "doorLockRemoved": { "sounds": [ "dimdoors:door_lock_removed" ] }, + "keyLock" : { "sounds" : [ "dimdoors:key_lock" ] }, + "keyUnlock" : { "sounds": [ "dimdoors:key_unlock" ] }, "monk" : { "sounds" : [ "dimdoors:monk" ] }, "rift" : { "sounds" : [ "dimdoors:rift" ] }, - "riftClose" : { "sounds" : [ "dimdoors:riftClose" ] }, - "riftDoor": { "sounds" : [ "dimdoors:riftDoor" ] }, - "riftEnd": { "sounds" : [ "dimdoors:riftEnd" ] }, - "riftStart": { "sounds" : [ "dimdoors:riftStart" ] }, + "riftClose" : { "sounds" : [ "dimdoors:rift_close" ] }, + "riftDoor": { "sounds" : [ "dimdoors:rift_door" ] }, + "riftEnd": { "sounds" : [ "dimdoors:rift_end" ] }, + "riftStart": { "sounds" : [ "dimdoors:rift_start" ] }, "tearing": { "sounds" : [ "dimdoors:tearing"] } } \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/sounds/doorLockRemoved.mp3 b/src/main/resources/assets/dimdoors/sounds/door_lock_removed.mp3 similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/doorLockRemoved.mp3 rename to src/main/resources/assets/dimdoors/sounds/door_lock_removed.mp3 diff --git a/src/main/resources/assets/dimdoors/sounds/doorLockRemoved.ogg b/src/main/resources/assets/dimdoors/sounds/door_lock_removed.ogg similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/doorLockRemoved.ogg rename to src/main/resources/assets/dimdoors/sounds/door_lock_removed.ogg diff --git a/src/main/resources/assets/dimdoors/sounds/doorLocked.mp3 b/src/main/resources/assets/dimdoors/sounds/door_locked.mp3 similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/doorLocked.mp3 rename to src/main/resources/assets/dimdoors/sounds/door_locked.mp3 diff --git a/src/main/resources/assets/dimdoors/sounds/doorLocked.ogg b/src/main/resources/assets/dimdoors/sounds/door_locked.ogg similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/doorLocked.ogg rename to src/main/resources/assets/dimdoors/sounds/door_locked.ogg diff --git a/src/main/resources/assets/dimdoors/sounds/keyLock.mp3 b/src/main/resources/assets/dimdoors/sounds/key_lock.mp3 similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/keyLock.mp3 rename to src/main/resources/assets/dimdoors/sounds/key_lock.mp3 diff --git a/src/main/resources/assets/dimdoors/sounds/keyLock.ogg b/src/main/resources/assets/dimdoors/sounds/key_lock.ogg similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/keyLock.ogg rename to src/main/resources/assets/dimdoors/sounds/key_lock.ogg diff --git a/src/main/resources/assets/dimdoors/sounds/keyUnlock.mp3 b/src/main/resources/assets/dimdoors/sounds/key_unlock.mp3 similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/keyUnlock.mp3 rename to src/main/resources/assets/dimdoors/sounds/key_unlock.mp3 diff --git a/src/main/resources/assets/dimdoors/sounds/keyUnlock.ogg b/src/main/resources/assets/dimdoors/sounds/key_unlock.ogg similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/keyUnlock.ogg rename to src/main/resources/assets/dimdoors/sounds/key_unlock.ogg diff --git a/src/main/resources/assets/dimdoors/sounds/riftClose.ogg b/src/main/resources/assets/dimdoors/sounds/rift_close.ogg similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/riftClose.ogg rename to src/main/resources/assets/dimdoors/sounds/rift_close.ogg diff --git a/src/main/resources/assets/dimdoors/sounds/riftDoor.ogg b/src/main/resources/assets/dimdoors/sounds/rift_door.ogg similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/riftDoor.ogg rename to src/main/resources/assets/dimdoors/sounds/rift_door.ogg diff --git a/src/main/resources/assets/dimdoors/sounds/riftEnd.ogg b/src/main/resources/assets/dimdoors/sounds/rift_end.ogg similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/riftEnd.ogg rename to src/main/resources/assets/dimdoors/sounds/rift_end.ogg diff --git a/src/main/resources/assets/dimdoors/sounds/riftStart.ogg b/src/main/resources/assets/dimdoors/sounds/rift_start.ogg similarity index 100% rename from src/main/resources/assets/dimdoors/sounds/riftStart.ogg rename to src/main/resources/assets/dimdoors/sounds/rift_start.ogg diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDimDoor_lower.png b/src/main/resources/assets/dimdoors/textures/blocks/dimensional_door_lower.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDimDoor_lower.png rename to src/main/resources/assets/dimdoors/textures/blocks/dimensional_door_lower.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDimDoor_upper.png b/src/main/resources/assets/dimdoors/textures/blocks/dimensional_door_upper.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDimDoor_upper.png rename to src/main/resources/assets/dimdoors/textures/blocks/dimensional_door_upper.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDimHatch.png b/src/main/resources/assets/dimdoors/textures/blocks/dimensional_trapdoor.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDimHatch.png rename to src/main/resources/assets/dimdoors/textures/blocks/dimensional_trapdoor.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockFabricAltered.png b/src/main/resources/assets/dimdoors/textures/blocks/fabric_altered.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockFabricAltered.png rename to src/main/resources/assets/dimdoors/textures/blocks/fabric_altered.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockFabricAncient.png b/src/main/resources/assets/dimdoors/textures/blocks/fabric_ancient.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockFabricAncient.png rename to src/main/resources/assets/dimdoors/textures/blocks/fabric_ancient.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockFabricAncient.png.mcmeta b/src/main/resources/assets/dimdoors/textures/blocks/fabric_ancient.png.mcmeta similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockFabricAncient.png.mcmeta rename to src/main/resources/assets/dimdoors/textures/blocks/fabric_ancient.png.mcmeta diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockFabricEternal.png b/src/main/resources/assets/dimdoors/textures/blocks/fabric_eternal.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockFabricEternal.png rename to src/main/resources/assets/dimdoors/textures/blocks/fabric_eternal.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockFabricReality.png b/src/main/resources/assets/dimdoors/textures/blocks/fabric_reality.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockFabricReality.png rename to src/main/resources/assets/dimdoors/textures/blocks/fabric_reality.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockFabricUnraveled.png b/src/main/resources/assets/dimdoors/textures/blocks/fabric_unraveled.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockFabricUnraveled.png rename to src/main/resources/assets/dimdoors/textures/blocks/fabric_unraveled.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockFabricUnraveled.png.mcmeta b/src/main/resources/assets/dimdoors/textures/blocks/fabric_unraveled.png.mcmeta similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockFabricUnraveled.png.mcmeta rename to src/main/resources/assets/dimdoors/textures/blocks/fabric_unraveled.png.mcmeta diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDoorGold_lower.png b/src/main/resources/assets/dimdoors/textures/blocks/gold_door_lower.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDoorGold_lower.png rename to src/main/resources/assets/dimdoors/textures/blocks/gold_door_lower.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDoorGold_upper.png b/src/main/resources/assets/dimdoors/textures/blocks/gold_door_upper.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDoorGold_upper.png rename to src/main/resources/assets/dimdoors/textures/blocks/gold_door_upper.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDoorQuartz_lower.png b/src/main/resources/assets/dimdoors/textures/blocks/quartz_door_lower.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDoorQuartz_lower.png rename to src/main/resources/assets/dimdoors/textures/blocks/quartz_door_lower.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDoorQuartz_upper.png b/src/main/resources/assets/dimdoors/textures/blocks/quartz_door_upper.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDoorQuartz_upper.png rename to src/main/resources/assets/dimdoors/textures/blocks/quartz_door_upper.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDimDoorChaos_upper.png b/src/main/resources/assets/dimdoors/textures/blocks/unstable_dimensional_door_upper.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDimDoorChaos_upper.png rename to src/main/resources/assets/dimdoors/textures/blocks/unstable_dimensional_door_upper.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDimDoorWarp_lower.png b/src/main/resources/assets/dimdoors/textures/blocks/warp_dimensional_door_lower.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDimDoorWarp_lower.png rename to src/main/resources/assets/dimdoors/textures/blocks/warp_dimensional_door_lower.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/blockDimDoorWarp_upper.png b/src/main/resources/assets/dimdoors/textures/blocks/warp_dimensional_door_upper.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/blockDimDoorWarp_upper.png rename to src/main/resources/assets/dimdoors/textures/blocks/warp_dimensional_door_upper.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemDDKey.png b/src/main/resources/assets/dimdoors/textures/items/dd_key.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemDDKey.png rename to src/main/resources/assets/dimdoors/textures/items/dd_key.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemDimDoor.png b/src/main/resources/assets/dimdoors/textures/items/dimensional_door.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemDimDoor.png rename to src/main/resources/assets/dimdoors/textures/items/dimensional_door.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemDimDoorGold.png b/src/main/resources/assets/dimdoors/textures/items/gold_dimensional_door.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemDimDoorGold.png rename to src/main/resources/assets/dimdoors/textures/items/gold_dimensional_door.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemDoorGold.png b/src/main/resources/assets/dimdoors/textures/items/gold_door.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemDoorGold.png rename to src/main/resources/assets/dimdoors/textures/items/gold_door.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemLinkSignature.png b/src/main/resources/assets/dimdoors/textures/items/link_signature.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemLinkSignature.png rename to src/main/resources/assets/dimdoors/textures/items/link_signature.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemDimDoorQuartz.png b/src/main/resources/assets/dimdoors/textures/items/quartz_dimensional_door.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemDimDoorQuartz.png rename to src/main/resources/assets/dimdoors/textures/items/quartz_dimensional_door.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemDoorQuartz.png b/src/main/resources/assets/dimdoors/textures/items/quartz_door.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemDoorQuartz.png rename to src/main/resources/assets/dimdoors/textures/items/quartz_door.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemRiftBlade.png b/src/main/resources/assets/dimdoors/textures/items/rift_blade.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemRiftBlade.png rename to src/main/resources/assets/dimdoors/textures/items/rift_blade.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemRiftConnectionTool.png b/src/main/resources/assets/dimdoors/textures/items/rift_connection_tool.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemRiftConnectionTool.png rename to src/main/resources/assets/dimdoors/textures/items/rift_connection_tool.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemRiftRemover.png b/src/main/resources/assets/dimdoors/textures/items/rift_remover.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemRiftRemover.png rename to src/main/resources/assets/dimdoors/textures/items/rift_remover.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemStabilizedRiftSig.png b/src/main/resources/assets/dimdoors/textures/items/stabilized_rift_sig.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemStabilizedRiftSig.png rename to src/main/resources/assets/dimdoors/textures/items/stabilized_rift_sig.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemStableFabric.png b/src/main/resources/assets/dimdoors/textures/items/stable_fabric.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemStableFabric.png rename to src/main/resources/assets/dimdoors/textures/items/stable_fabric.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemDimDoorChaos.png b/src/main/resources/assets/dimdoors/textures/items/unstable_dimensional_door.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemDimDoorChaos.png rename to src/main/resources/assets/dimdoors/textures/items/unstable_dimensional_door.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemDimDoorWarp.png b/src/main/resources/assets/dimdoors/textures/items/warp_dimensional_door.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemDimDoorWarp.png rename to src/main/resources/assets/dimdoors/textures/items/warp_dimensional_door.png diff --git a/src/main/resources/assets/dimdoors/textures/items/itemWorldThread.png b/src/main/resources/assets/dimdoors/textures/items/world_thread.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/items/itemWorldThread.png rename to src/main/resources/assets/dimdoors/textures/items/world_thread.png diff --git a/src/main/resources/assets/dimdoors/textures/other/limboMoon.png b/src/main/resources/assets/dimdoors/textures/other/limbo_moon.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/other/limboMoon.png rename to src/main/resources/assets/dimdoors/textures/other/limbo_moon.png diff --git a/src/main/resources/assets/dimdoors/textures/other/limboSun.png b/src/main/resources/assets/dimdoors/textures/other/limbo_sun.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/other/limboSun.png rename to src/main/resources/assets/dimdoors/textures/other/limbo_sun.png diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 67ff781a..4ed7a559 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -9,13 +9,13 @@ "version": "${version}", "credits": "Created by StevenRS11, Coded by StevenRS11 and SenseiKiwi, Logo and Testing by Jaitsu, Recent updates by Zixiken and Waterpicker", "logoFile": "/dimdoors_logo.png", - "mcversion": "1.10.2", + "mcversion": "1.12.2", "url": "http://www.minecraftforum.net/topic/1650007", "updateUrl": "", "authorList": [ "StevenRS11", "SenseiKiwi", "Zixiken", "WaterPicker", "Robijnvogel" ], "parent":"", "screenshots": [], - "dependencies": [ "Forge"] + "dependencies": [ "forge" ] } ] } \ No newline at end of file