From 5d5240e81c6a9a2f756244813b703852c12fea17 Mon Sep 17 00:00:00 2001 From: Mathijs Riezebos Date: Wed, 12 Apr 2017 13:01:46 +0200 Subject: [PATCH] Refractored DimWall to Fabric Refractored -BlockDimWall to BlockFabric -ItemBlockDimWall to ItemBlockFabric --- .../blocks/{BlockDimWall.java => BlockFabric.java} | 6 +++--- .../com/zixiken/dimdoors/shared/blocks/ModBlocks.java | 4 ++-- .../{ItemBlockDimWall.java => ItemBlockFabric.java} | 8 ++++---- .../com/zixiken/dimdoors/shared/items/ModItems.java | 4 ++-- .../com/zixiken/dimdoors/shared/util/Schematic.java | 10 +++++----- .../shared/world/limbodimension/LimboDecay.java | 10 +++++----- .../shared/world/limbodimension/LimboGenerator.java | 6 +++--- .../world/limbodimension/WorldProviderLimbo.java | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) rename src/main/java/com/zixiken/dimdoors/shared/blocks/{BlockDimWall.java => BlockFabric.java} (97%) rename src/main/java/com/zixiken/dimdoors/shared/items/{ItemBlockDimWall.java => ItemBlockFabric.java} (80%) diff --git a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimWall.java b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockFabric.java similarity index 97% rename from src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimWall.java rename to src/main/java/com/zixiken/dimdoors/shared/blocks/BlockFabric.java index d3d16c5b..43341de1 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockDimWall.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/BlockFabric.java @@ -35,15 +35,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @SuppressWarnings("deprecation") -public class BlockDimWall extends Block { +public class BlockFabric extends Block { public static final String ID = "blockFabric"; - public static final PropertyEnum TYPE = PropertyEnum.create("type", BlockDimWall.EnumType.class); + public static final PropertyEnum TYPE = PropertyEnum.create("type", BlockFabric.EnumType.class); private static final float SUPER_HIGH_HARDNESS = 10000000000000F; private static final float SUPER_EXPLOSION_RESISTANCE = 18000000F; - public BlockDimWall() { + public BlockFabric() { super(Material.IRON); this.setCreativeTab(DimDoors.dimDoorsCreativeTab); setLightLevel(1.0F); 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 819750a4..5f810f5b 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/blocks/ModBlocks.java +++ b/src/main/java/com/zixiken/dimdoors/shared/blocks/ModBlocks.java @@ -13,7 +13,7 @@ public class ModBlocks { public static BlockDimDoorChaos blockDimDoorChaos; public static BlockDimDoor blockDimDoor; public static BlockTransTrapdoor blockDimHatch; - public static BlockDimWall blockFabric; + public static BlockFabric blockFabric; public static BlockRift blockRift; public static void registerBlocks() { @@ -25,7 +25,7 @@ public class ModBlocks { GameRegistry.register(blockDimDoorWarp = new BlockDimDoorWarp()); GameRegistry.register(blockDimDoor = new BlockDimDoor()); GameRegistry.register(blockDimHatch = new BlockTransTrapdoor()); - GameRegistry.register(blockFabric = new BlockDimWall()); + GameRegistry.register(blockFabric = new BlockFabric()); GameRegistry.register(blockDimDoorTransient = new BlockDimDoorTransient()); GameRegistry.register(blockRift = new BlockRift()); } diff --git a/src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockDimWall.java b/src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockFabric.java similarity index 80% rename from src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockDimWall.java rename to src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockFabric.java index 21e17b2c..018c2ab4 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockDimWall.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ItemBlockFabric.java @@ -1,21 +1,21 @@ package com.zixiken.dimdoors.shared.items; import com.zixiken.dimdoors.DimDoors; -import com.zixiken.dimdoors.shared.blocks.BlockDimWall; +import com.zixiken.dimdoors.shared.blocks.BlockFabric; import com.zixiken.dimdoors.shared.blocks.ModBlocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBlockDimWall extends ItemBlock { +public class ItemBlockFabric extends ItemBlock { private final static String[] subNames = {"Reality", "Ancient", "Altered", "Unraveled", "Eternal"}; - public ItemBlockDimWall() { + public ItemBlockFabric() { super(ModBlocks.blockFabric); setCreativeTab(DimDoors.dimDoorsCreativeTab); setMaxDamage(0); setHasSubtypes(true); - setRegistryName(BlockDimWall.ID); + setRegistryName(BlockFabric.ID); } @Override 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 98150011..dd9c388f 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/items/ModItems.java +++ b/src/main/java/com/zixiken/dimdoors/shared/items/ModItems.java @@ -15,7 +15,7 @@ public class ModItems { public static ItemDimDoorUnstable itemDimDoorChaos; public static ItemDoorQuartz itemDoorQuartz; public static ItemDimDoorPersonal itemDimDoorPersonal; - public static ItemBlockDimWall itemBlockDimWall; + public static ItemBlockFabric itemBlockFabric; public static ItemRiftConnectionTool itemRiftConnectionTool; public static ItemRiftBlade itemRiftBlade; @@ -33,7 +33,7 @@ public class ModItems { GameRegistry.register(itemRiftBlade = new ItemRiftBlade()); //ItemBlocks - GameRegistry.register(itemBlockDimWall = new ItemBlockDimWall()); + GameRegistry.register(itemBlockFabric = new ItemBlockFabric()); GameRegistry.register(new ItemBlock(ModBlocks.blockDimHatch) .setRegistryName(ModBlocks.blockDimHatch.getRegistryName())); GameRegistry.register(new ItemBlock(ModBlocks.blockRift) 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 32eec969..1fcb2a4a 100644 --- a/src/main/java/com/zixiken/dimdoors/shared/util/Schematic.java +++ b/src/main/java/com/zixiken/dimdoors/shared/util/Schematic.java @@ -35,7 +35,7 @@ public class Schematic { private static final String[] NEWDIMDOORBLOCKNAMES = new String[]{ "blockDimDoor", - "blockDimWall", //[type=fabric] is the default blockstate + "blockFabric", //[type=fabric] is the default blockstate "blockDimDoorTransient", "blockDimDoorWarp"}; @@ -341,7 +341,7 @@ public class Schematic { Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockString)); blockstate = block.getDefaultState(); } else { - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation("dimdoors:blockDimWall")); + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation("dimdoors:blockFabric")); blockstate = getBlockStateWithProperties(block, new String[]{"type=ancient"}); } schematic.pallette.add(blockstate); @@ -407,8 +407,8 @@ public class Schematic { /* public static void TempGenerateDefaultSchematics() { for (int pocketSize = 0; pocketSize < 8; pocketSize++) { - generateDefaultSchematic("defaultPublic", pocketSize, ModBlocks.blockDimWall.getDefaultState().withProperty(BlockDimWall.TYPE, BlockDimWall.EnumType.REALITY), ModBlocks.blockDimDoor); - generateDefaultSchematic("defaultPrivate", pocketSize, ModBlocks.blockDimWall.getDefaultState().withProperty(BlockDimWall.TYPE, BlockDimWall.EnumType.ALTERED), ModBlocks.blockDimDoorPersonal); + 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); } } @@ -430,7 +430,7 @@ public class Schematic { schematic.paletteMax = 4; schematic.pallette = new ArrayList(); schematic.pallette.add(Blocks.AIR.getDefaultState()); - schematic.pallette.add(ModBlocks.blockDimWall.getDefaultState().withProperty(BlockDimWall.TYPE, BlockDimWall.EnumType.ANCIENT)); + schematic.pallette.add(ModBlocks.blockFabric.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 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 fbef2999..330b8d38 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 @@ -1,6 +1,6 @@ package com.zixiken.dimdoors.shared.world.limbodimension; -import com.zixiken.dimdoors.shared.blocks.BlockDimWall; +import com.zixiken.dimdoors.shared.blocks.BlockFabric; import com.zixiken.dimdoors.shared.blocks.ModBlocks; import com.zixiken.dimdoors.shared.world.DimDoorDimensions; import net.minecraft.block.BlockContainer; @@ -34,7 +34,7 @@ public class LimboDecay { public static IBlockState[] getDecaySequence() { if (decaySequence == null) { decaySequence = new IBlockState[] { - ModBlocks.blockFabric.getDefaultState().withProperty(BlockDimWall.TYPE, BlockDimWall.EnumType.UNRAVELED), + ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED), Blocks.GRAVEL.getDefaultState(), Blocks.COBBLESTONE.getDefaultState(), Blocks.STONE.getDefaultState() @@ -47,8 +47,8 @@ public class LimboDecay { public static IBlockState[] getBlocksImmuneToDecay() { if (blocksImmuneToDecay == null) { blocksImmuneToDecay = new IBlockState[] { - ModBlocks.blockFabric.getDefaultState().withProperty(BlockDimWall.TYPE, BlockDimWall.EnumType.UNRAVELED), - ModBlocks.blockFabric.getDefaultState().withProperty(BlockDimWall.TYPE, BlockDimWall.EnumType.ETERNAL), + 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(), @@ -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(BlockDimWall.TYPE, BlockDimWall.EnumType.UNRAVELED)); + world.setBlockState(pos, ModBlocks.blockFabric.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 deb84162..ae62369f 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 @@ -1,6 +1,6 @@ package com.zixiken.dimdoors.shared.world.limbodimension; -import com.zixiken.dimdoors.shared.blocks.BlockDimWall; +import com.zixiken.dimdoors.shared.blocks.BlockFabric; import com.zixiken.dimdoors.shared.blocks.ModBlocks; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Biomes; @@ -307,10 +307,10 @@ public class LimboGenerator implements IChunkGenerator int zCoord = zSectionPart + zRel; if(vxyz > 0) { primer.setBlockState(xCoord, yCoord, zCoord, - ModBlocks.blockFabric.getDefaultState().withProperty(BlockDimWall.TYPE, BlockDimWall.EnumType.UNRAVELED)); + ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED)); } else if(yCoord < 6) { primer.setBlockState(xCoord, yCoord, zCoord, - ModBlocks.blockFabric.getDefaultState().withProperty(BlockDimWall.TYPE, BlockDimWall.EnumType.ETERNAL)); + ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ETERNAL)); } } 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 d3c09394..1d5f2e86 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 @@ -1,7 +1,7 @@ package com.zixiken.dimdoors.shared.world.limbodimension; import com.zixiken.dimdoors.client.CloudRenderBlank; -import com.zixiken.dimdoors.shared.blocks.BlockDimWall; +import com.zixiken.dimdoors.shared.blocks.BlockFabric; import com.zixiken.dimdoors.shared.blocks.ModBlocks; import com.zixiken.dimdoors.shared.util.Location; import com.zixiken.dimdoors.shared.world.DimDoorDimensions; @@ -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(BlockDimWall.TYPE, BlockDimWall.EnumType.UNRAVELED)); + return world.getBlockState(pos).equals(ModBlocks.blockFabric.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED)); } @Override