Skip to content

Metal bars & craftable ancient bars (#218) #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
M-W-K wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Metal bars & craftable ancient bars (#218) #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/thecodex6824/thaumicaugmentation/api/block/property/ITABarsType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ public interface ITABarsType {

public enum BarsType implements IStringSerializable {

BARS_ANCIENT(0, () -> Material.IRON, () -> SoundType.METAL, MapColor.ADOBE);
BARS_ANCIENT(0, () -> Material.IRON, () -> SoundType.METAL, MapColor.ADOBE),
BARS_BRASS(1, () -> Material.IRON, () -> SoundType.METAL, MapColor.GOLD),
BARS_THAUMIUM(2, () -> Material.IRON, () -> SoundType.METAL, MapColor.PURPLE),
BARS_VOID(3, () -> Material.IRON, () -> SoundType.METAL, MapColor.BLACK);

private int meta;
private Supplier<Material> mat;
Expand Down
104 changes: 104 additions & 0 deletions src/main/resources/assets/thaumicaugmentation/blockstates/bars_brass.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"multipart": [
{
"apply": {
"model": "thaumicaugmentation:bars_brass_post_ends"
}
},
{
"when": {
"north": false,
"east": false,
"south": false,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_brass_post"
}
},
{
"when": {
"north": true,
"east": false,
"south": false,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_brass_cap",
"uvlock": true
}
},
{
"when": {
"north": false,
"east": true,
"south": false,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_brass_cap",
"y": 90
}
},
{
"when": {
"north": false,
"east": false,
"south": true,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_brass_cap",
"y": 180
}
},
{
"when": {
"north": false,
"east": false,
"south": false,
"west": true
},
"apply": {
"model": "thaumicaugmentation:bars_brass_cap",
"y": 270
}
},
{
"when": {
"north": true
},
"apply": {
"model": "thaumicaugmentation:bars_brass_side"
}
},
{
"when": {
"east": true
},
"apply": {
"model": "thaumicaugmentation:bars_brass_side",
"y": 90
}
},
{
"when": {
"south": true
},
"apply": {
"model": "thaumicaugmentation:bars_brass_side",
"y": 180
}
},
{
"when": {
"west": true
},
"apply": {
"model": "thaumicaugmentation:bars_brass_side",
"y": 270
}
}
]
}

104 changes: 104 additions & 0 deletions src/main/resources/assets/thaumicaugmentation/blockstates/bars_thaumium.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"multipart": [
{
"apply": {
"model": "thaumicaugmentation:bars_thaumium_post_ends"
}
},
{
"when": {
"north": false,
"east": false,
"south": false,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_thaumium_post"
}
},
{
"when": {
"north": true,
"east": false,
"south": false,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_thaumium_cap",
"uvlock": true
}
},
{
"when": {
"north": false,
"east": true,
"south": false,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_thaumium_cap",
"y": 90
}
},
{
"when": {
"north": false,
"east": false,
"south": true,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_thaumium_cap",
"y": 180
}
},
{
"when": {
"north": false,
"east": false,
"south": false,
"west": true
},
"apply": {
"model": "thaumicaugmentation:bars_thaumium_cap",
"y": 270
}
},
{
"when": {
"north": true
},
"apply": {
"model": "thaumicaugmentation:bars_thaumium_side"
}
},
{
"when": {
"east": true
},
"apply": {
"model": "thaumicaugmentation:bars_thaumium_side",
"y": 90
}
},
{
"when": {
"south": true
},
"apply": {
"model": "thaumicaugmentation:bars_thaumium_side",
"y": 180
}
},
{
"when": {
"west": true
},
"apply": {
"model": "thaumicaugmentation:bars_thaumium_side",
"y": 270
}
}
]
}

104 changes: 104 additions & 0 deletions src/main/resources/assets/thaumicaugmentation/blockstates/bars_void.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"multipart": [
{
"apply": {
"model": "thaumicaugmentation:bars_void_post_ends"
}
},
{
"when": {
"north": false,
"east": false,
"south": false,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_void_post"
}
},
{
"when": {
"north": true,
"east": false,
"south": false,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_void_cap",
"uvlock": true
}
},
{
"when": {
"north": false,
"east": true,
"south": false,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_void_cap",
"y": 90
}
},
{
"when": {
"north": false,
"east": false,
"south": true,
"west": false
},
"apply": {
"model": "thaumicaugmentation:bars_void_cap",
"y": 180
}
},
{
"when": {
"north": false,
"east": false,
"south": false,
"west": true
},
"apply": {
"model": "thaumicaugmentation:bars_void_cap",
"y": 270
}
},
{
"when": {
"north": true
},
"apply": {
"model": "thaumicaugmentation:bars_void_side"
}
},
{
"when": {
"east": true
},
"apply": {
"model": "thaumicaugmentation:bars_void_side",
"y": 90
}
},
{
"when": {
"south": true
},
"apply": {
"model": "thaumicaugmentation:bars_void_side",
"y": 180
}
},
{
"when": {
"west": true
},
"apply": {
"model": "thaumicaugmentation:bars_void_side",
"y": 270
}
}
]
}

3 changes: 3 additions & 0 deletions src/main/resources/assets/thaumicaugmentation/lang/en_us.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ tile.thaumicaugmentation.stairs_ancient.name=Ancient Stone Stairs
tile.thaumicaugmentation.stairs_eldritch_tile.name=Eldritch Stone Stairs
tile.thaumicaugmentation.ancient_tile_slab.name=Ancient Stone Tile Slab
tile.thaumicaugmentation.bars.bars_ancient.name=Ancient Bars
tile.thaumicaugmentation.bars.bars_brass.name=Brass Bars
tile.thaumicaugmentation.bars.bars_thaumium.name=Thaumium Bars
tile.thaumicaugmentation.bars.bars_void.name=Void Metal Bars
tile.thaumicaugmentation.fortified_glass.name=Fortified Glass
tile.thaumicaugmentation.fortified_glass_pane.name=Fortified Glass Pane
tile.thaumicaugmentation.starfield_glass.glass_rift.name=Starfield Glass (Rift)
Expand Down
25 changes: 25 additions & 0 deletions src/main/resources/assets/thaumicaugmentation/models/block/bars_brass_cap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"credit": "Made with Blockbench",
"ambientocclusion": false,
"textures": {
"bars": "thaumicaugmentation:blocks/brass_bars"
},
"elements": [
{
"from": [8, 0, 8],
"to": [8, 16, 9],
"faces": {
"east": {"uv": [9, 0, 10, 16], "texture": "#bars"},
"west": {"uv": [11, 0, 10, 16], "texture": "#bars"}
}
},
{
"from": [7, 0, 9],
"to": [9, 16, 9],
"faces": {
"north": {"uv": [11, 0, 9, 16], "texture": "#bars"},
"south": {"uv": [9, 0, 11, 16], "texture": "#bars"}
}
}
]
}
25 changes: 25 additions & 0 deletions src/main/resources/assets/thaumicaugmentation/models/block/bars_brass_post.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"credit": "Made with Blockbench",
"ambientocclusion": false,
"textures": {
"bars": "thaumicaugmentation:blocks/brass_bars"
},
"elements": [
{
"from": [8, 0, 7],
"to": [8, 16, 9],
"faces": {
"east": {"uv": [11, 0, 9, 16], "texture": "#bars"},
"west": {"uv": [9, 0, 11, 16], "texture": "#bars"}
}
},
{
"from": [7, 0, 8],
"to": [9, 16, 8],
"faces": {
"north": {"uv": [9, 0, 11, 16], "texture": "#bars"},
"south": {"uv": [11, 0, 9, 16], "texture": "#bars"}
}
}
]
}
Loading
Loading