Add ancient altered fabric

This commit is contained in:
Runemoro 2017-12-18 18:56:57 -05:00
parent aba957bfdd
commit 3ee8b610ab
28 changed files with 36 additions and 13 deletions

View file

@ -24,8 +24,9 @@ public class ModelManager {
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.FABRIC), 3, "ancient_altered");
register(getItemFromBlock(ModBlocks.FABRIC), 4, "unraveled");
register(getItemFromBlock(ModBlocks.FABRIC), 5, "eternal");
register(getItemFromBlock(ModBlocks.RIFT));
register(getItemFromBlock(ModBlocks.DIMENSIONAL_TRAPDOOR));
@ -49,6 +50,7 @@ public class ModelManager {
new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_reality"),
new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_ancient"),
new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_altered"),
new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_ancient_altered"),
new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_unraveled"),
new ResourceLocation(ModBlocks.FABRIC.getRegistryName() + "_eternal"));
}

View file

@ -40,8 +40,9 @@ public class BlockFabric extends Block {
REALITY("reality", 0),
ANCIENT("ancient", 1),
ALTERED("altered", 2),
UNRAVELED("unraveled", 3),
ETERNAL("eternal", 4);
ANCIENT_ALTERED("ancient_altered", 3),
UNRAVELED("unraveled", 4),
ETERNAL("eternal", 5);
@Getter private final String name;
@Getter private final int meta;
@ -91,7 +92,7 @@ public class BlockFabric extends Block {
@Override
public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) {
if (blockState.getValue(TYPE).equals(EnumType.ANCIENT) || blockState.getValue(TYPE).equals(EnumType.ETERNAL)) {
if (blockState.getValue(TYPE).equals(EnumType.ANCIENT)|| blockState.getValue(TYPE).equals(EnumType.ANCIENT_ALTERED) || blockState.getValue(TYPE).equals(EnumType.ETERNAL)) {
return -1; // unbreakable
} else {
return blockHardness;
@ -101,7 +102,7 @@ public class BlockFabric extends Block {
@Override
public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion) {
IBlockState state = world.getBlockState(pos);
if (state.getValue(TYPE).equals(EnumType.ANCIENT) || state.getValue(TYPE).equals(EnumType.ETERNAL)) {
if (state.getValue(TYPE).equals(EnumType.ANCIENT) || state.getValue(TYPE).equals(EnumType.ANCIENT_ALTERED) || state.getValue(TYPE).equals(EnumType.ETERNAL)) {
return 6000000.0F / 5;
} else {
return super.getExplosionResistance(world, pos, exploder, explosion);

View file

@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
public class ItemBlockFabric extends ItemBlock {
private static final String[] subNames = {"_reality", "_ancient", "_altered", "_unraveled", "_eternal"};
private static final String[] subNames = {"_reality", "_ancient", "_altered", "_ancient_altered", "_unraveled", "_eternal"};
public ItemBlockFabric() {
super(ModBlocks.FABRIC);

View file

@ -12,7 +12,6 @@ import net.minecraft.block.BlockDoor;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import java.util.ArrayList;
@ -23,12 +22,12 @@ import java.util.ArrayList;
public class DefaultSchematicGenerator {
public static void generateDefaultSchematics() {
for (int pocketSize = 0; pocketSize < 8; pocketSize++) {
generateDefaultSchematic("defaultPublic", pocketSize, ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.REALITY), ModBlocks.DIMENSIONAL_DOOR, RiftDestination.PocketExitDestination.builder().build());
generateDefaultSchematic("defaultPrivate", pocketSize, ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ALTERED), ModBlocks.PERSONAL_DIMENSIONAL_DOOR, RiftDestination.PrivatePocketExitDestination.builder().build());
generateDefaultSchematic("defaultPublic", pocketSize, ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ANCIENT), ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.REALITY), ModBlocks.DIMENSIONAL_DOOR, RiftDestination.PocketExitDestination.builder().build());
generateDefaultSchematic("defaultPrivate", pocketSize, ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ANCIENT_ALTERED), ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ALTERED), ModBlocks.PERSONAL_DIMENSIONAL_DOOR, RiftDestination.PrivatePocketExitDestination.builder().build());
}
}
private static void generateDefaultSchematic(String baseName, int pocketSize, IBlockState innerWallBlockState, Block doorBlock, RiftDestination exitDest) {
private static void generateDefaultSchematic(String baseName, int pocketSize, IBlockState outerWallBlockState, IBlockState innerWallBlockState, Block doorBlock, RiftDestination exitDest) {
int maxbound = (pocketSize + 1) * 16 - 1;
Schematic schematic = new Schematic();
@ -46,7 +45,7 @@ public class DefaultSchematicGenerator {
schematic.paletteMax = 4;
schematic.pallette = new ArrayList<>();
schematic.pallette.add(Blocks.AIR.getDefaultState());
schematic.pallette.add(ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ANCIENT));
schematic.pallette.add(outerWallBlockState);
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

View file

@ -50,6 +50,7 @@ public class LimboDecay {
ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.UNRAVELED),
ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ETERNAL),
ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ANCIENT),
ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabric.TYPE, BlockFabric.EnumType.ANCIENT_ALTERED),
ModBlocks.TRANSIENT_DIMENSIONAL_DOOR.getDefaultState(),
ModBlocks.DIMENSIONAL_DOOR.getDefaultState(),
ModBlocks.WARP_DIMENSIONAL_DOOR.getDefaultState(),

View file

@ -1,8 +1,9 @@
{
"variants": {
"type=reality": { "model": "dimdoors:fabric_reality" },
"type=ancient": { "model": "dimdoors:fabric_ancient" },
"type=altered": { "model": "dimdoors:fabric_altered" },
"type=ancient": { "model": "dimdoors:fabric_ancient" },
"type=ancient_altered": { "model": "dimdoors:fabric_ancient_altered" },
"type=unraveled": { "model": "dimdoors:fabric_unraveled" },
"type=eternal": { "model": "dimdoors:fabric_eternal" }
}

View file

@ -14,6 +14,7 @@ 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_ancient_altered.name=Ancient Altered Fabric
tile.fabric_eternal.name=Eternal Fabric
tile.fabric_unraveled.name=Unraveled Fabric
tile.rift.name=Rift

View file

@ -14,6 +14,7 @@ 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_ancient_altered.name=Étoffe altérée ancienne
tile.fabric_eternal.name=Étoffe éternelle
tile.fabric_unraveled.name=Étoffe effilochée
tile.rift.name=Fissure

View file

@ -0,0 +1,4 @@
{
"parent": "block/cube_all",
"textures": { "all": "dimdoors:blocks/fabric_ancient_altered" }
}

View file

@ -0,0 +1,10 @@
{
"parent": "dimdoors:block/fabric_ancient_altered",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

Binary file not shown.

After

(image error) Size: 11 KiB

View file

@ -0,0 +1,3 @@
{
"animation": { "frametime": 2 }
}