Skip to content

Commit

Permalink
New: Painted Trapdoors
Browse files Browse the repository at this point in the history
  • Loading branch information
HenryLoenwind committed Dec 2, 2016
1 parent 9b0a159 commit 186a386
Show file tree
Hide file tree
Showing 7 changed files with 348 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"forge_marker":1,
"defaults":{
"textures":{
"particle":"enderio:blocks/dark_iron_trapdoor"
},
"model":"trapdoor_bottom"
},
"variants": {
"inventory": [{}],
"half":{
"top": { },
"bottom": { }
}
}
}
16 changes: 16 additions & 0 deletions resources/assets/enderio/blockstates/blockPaintedIronTrapdoor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"forge_marker":1,
"defaults":{
"textures":{
"particle":"blocks/iron_trapdoor"
},
"model":"trapdoor_bottom"
},
"variants": {
"inventory": [{}],
"half":{
"top": { },
"bottom": { }
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"forge_marker":1,
"defaults":{
"textures":{
"particle":"blocks/trapdoor"
},
"model":"trapdoor_bottom"
},
"variants": {
"inventory": [{}],
"half":{
"top": { },
"bottom": { }
}
}
}
8 changes: 6 additions & 2 deletions resources/assets/enderio/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -802,14 +802,18 @@ tile.blockPaintedRedstone.name=Painted Redstone
tile.blockPaintedRedstoneSolid.name=Painted Redstone
tile.blockPaintedStone.name=Painted Cobblestone
tile.blockPaintedCarpet.name=Painted Carpet
tile.blockPaintedWoodenTrapdoor.name=Painted Wooden Trapdoor
tile.blockPaintedIronTrapdoor.name=Painted Iron Trapdoor
tile.blockPaintedDarkSteelTrapdoor.name=Painted Dark Steel Trapdoor

enderio.painter.tooltip.wasPainted=§oWhat did you think that would do?

tile.blockPainter.tooltip.detailed.line1=Used to paint:
tile.blockPainter.tooltip.detailed.line2=Conduit Facades, Stairs, Fences, Gates,
tile.blockPainter.tooltip.detailed.line3=Slabs, Cobblestone, Cobblestone Walls,
tile.blockPainter.tooltip.detailed.line4=Glowstone, Redstone, Carpet, Pressure
tile.blockPainter.tooltip.detailed.line5=Plates, Quite Clear Glass, Fused Quartz,
tile.blockPainter.tooltip.detailed.line6=and most machines
tile.blockPainter.tooltip.detailed.line6=Trapdoors, and most machines

//Items
item.itemYetaWrench.name=Yeta Wrench
Expand Down Expand Up @@ -1522,4 +1526,4 @@ enderio.wrench.permission.denied=Permission denied
enderio.soulvial.denied=Permission denied
enderio.soulvial.owned.denied=Permission denied - only owners may pickup owned animals

tile.blockDarkSteelTrapdoor.name=Dark Steel Trap Door
tile.blockDarkSteelTrapdoor.name=Dark Steel Trapdoor
7 changes: 7 additions & 0 deletions src/main/java/crazypants/enderio/ModObject.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
import crazypants.enderio.machine.painter.blocks.BlockPaintedSlab;
import crazypants.enderio.machine.painter.blocks.BlockPaintedStairs;
import crazypants.enderio.machine.painter.blocks.BlockPaintedStone;
import crazypants.enderio.machine.painter.blocks.BlockPaintedTrapDoor;
import crazypants.enderio.machine.painter.blocks.BlockPaintedWall;
import crazypants.enderio.machine.reservoir.BlockReservoir;
import crazypants.enderio.machine.sagmill.BlockSagMill;
Expand Down Expand Up @@ -257,6 +258,10 @@ protected void preInitElem(FMLPreInitializationEvent event) {
blockPaintedRedstone(BlockPaintedRedstone.class),
blockPaintedRedstoneSolid,
blockPaintedStone(BlockPaintedStone.class),
blockPaintedWoodenTrapdoor(BlockPaintedTrapDoor.class, "create_wooden"),
blockPaintedIronTrapdoor(BlockPaintedTrapDoor.class, "create_iron"),
blockPaintedDarkSteelTrapdoor(BlockPaintedTrapDoor.class, "create_dark"),

blockExitRail(BlockExitRail.class),

itemConduitProbe(ItemConduitProbe.class),
Expand Down Expand Up @@ -325,10 +330,12 @@ private ModObject() {
return unlocalisedName;
}

@Override
public Block getBlock() {
return block;
}

@Override
public Item getItem() {
return item;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static BlockDarkSteelTrapDoor create() {
return res;
}

private final IModObject modObject;
protected final IModObject modObject;

public BlockDarkSteelTrapDoor(IModObject modObject, Material materialIn, boolean isBlastResistant) {
super(materialIn);
Expand Down
Loading

0 comments on commit 186a386

Please sign in to comment.