Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "galacticraft:block/aluminum_ladder",
"y": 90
},
"facing=north": {
"model": "galacticraft:block/aluminum_ladder"
},
"facing=south": {
"model": "galacticraft:block/aluminum_ladder",
"y": 180
},
"facing=west": {
"model": "galacticraft:block/aluminum_ladder",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "galacticraft:block/bronze_ladder",
"y": 90
},
"facing=north": {
"model": "galacticraft:block/bronze_ladder"
},
"facing=south": {
"model": "galacticraft:block/bronze_ladder",
"y": 180
},
"facing=west": {
"model": "galacticraft:block/bronze_ladder",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "galacticraft:block/steel_ladder",
"y": 90
},
"facing=north": {
"model": "galacticraft:block/steel_ladder"
},
"facing=south": {
"model": "galacticraft:block/steel_ladder",
"y": 180
},
"facing=west": {
"model": "galacticraft:block/steel_ladder",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "galacticraft:block/titanium_ladder",
"y": 90
},
"facing=north": {
"model": "galacticraft:block/titanium_ladder"
},
"facing=south": {
"model": "galacticraft:block/titanium_ladder",
"y": 180
},
"facing=west": {
"model": "galacticraft:block/titanium_ladder",
"y": 270
}
}
}
4 changes: 4 additions & 0 deletions src/main/generated/assets/galacticraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"block.galacticraft.aluminum_decoration_slab": "Aluminum Decoration Slab",
"block.galacticraft.aluminum_decoration_stairs": "Aluminum Decoration Stairs",
"block.galacticraft.aluminum_decoration_wall": "Aluminum Decoration Wall",
"block.galacticraft.aluminum_ladder": "Aluminum Ladder",
"block.galacticraft.aluminum_ore": "Aluminum Ore",
"block.galacticraft.aluminum_wire": "Aluminum Wire",
"block.galacticraft.asteroid_aluminum_ore": "Asteroid Aluminum Ore",
Expand Down Expand Up @@ -120,6 +121,7 @@
"block.galacticraft.bronze_decoration_slab": "Bronze Decoration Slab",
"block.galacticraft.bronze_decoration_stairs": "Bronze Decoration Stairs",
"block.galacticraft.bronze_decoration_wall": "Bronze Decoration Wall",
"block.galacticraft.bronze_ladder": "Bronze Ladder",
"block.galacticraft.brown_candle_moon_cheese_wheel": "Moon Cheese Wheel with Brown Candle",
"block.galacticraft.brown_glass_fluid_pipe": "Brown Stained Glass Fluid Pipe",
"block.galacticraft.candle_moon_cheese_wheel": "Moon Cheese Wheel with Candle",
Expand Down Expand Up @@ -355,6 +357,7 @@
"block.galacticraft.steel_decoration_slab": "Steel Decoration Slab",
"block.galacticraft.steel_decoration_stairs": "Steel Decoration Stairs",
"block.galacticraft.steel_decoration_wall": "Steel Decoration Wall",
"block.galacticraft.steel_ladder": "Steel Ladder",
"block.galacticraft.sulfuric_acid": "Sulfuric Acid",
"block.galacticraft.tin_block": "Block of Tin",
"block.galacticraft.tin_decoration": "Tin Decoration",
Expand All @@ -368,6 +371,7 @@
"block.galacticraft.titanium_decoration_slab": "Titanium Decoration Slab",
"block.galacticraft.titanium_decoration_stairs": "Titanium Decoration Stairs",
"block.galacticraft.titanium_decoration_wall": "Titanium Decoration Wall",
"block.galacticraft.titanium_ladder": "Titanium Ladder",
"block.galacticraft.unlit_lantern": "Unlit Lantern",
"block.galacticraft.unlit_soul_lantern": "Unlit Soul Lantern",
"block.galacticraft.unlit_soul_torch": "Unlit Soul Torch",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "galacticraft:block/aluminum_ladder"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "galacticraft:block/bronze_ladder"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "galacticraft:block/steel_ladder"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "galacticraft:block/titanium_ladder"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_aluminum_ingot": {
"conditions": {
"items": [
{
"items": "#c:ingots/aluminum"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "galacticraft:aluminum_ladder"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_aluminum_ingot"
]
],
"rewards": {
"recipes": [
"galacticraft:aluminum_ladder"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_the_recipe": {
"conditions": {
"recipe": "galacticraft:titanium_ladder"
},
"trigger": "minecraft:recipe_unlocked"
},
"has_titanium_ingot": {
"conditions": {
"items": [
{
"items": "#c:ingots/titanium"
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"requirements": [
[
"has_the_recipe",
"has_titanium_ingot"
]
],
"rewards": {
"recipes": [
"galacticraft:titanium_ladder"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "galacticraft:aluminum_ladder"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "galacticraft:bronze_ladder"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "galacticraft:steel_ladder"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "galacticraft:titanium_ladder"
}
],
"rolls": 1.0
}
]
}
18 changes: 18 additions & 0 deletions src/main/generated/data/galacticraft/recipe/aluminum_ladder.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"A": {
"tag": "c:ingots/aluminum"
}
},
"pattern": [
"A A",
"AAA",
"A A"
],
"result": {
"count": 6,
"id": "galacticraft:aluminum_ladder"
}
}
18 changes: 18 additions & 0 deletions src/main/generated/data/galacticraft/recipe/titanium_ladder.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"T": {
"tag": "c:ingots/titanium"
}
},
"pattern": [
"T T",
"TTT",
"T T"
],
"result": {
"count": 6,
"id": "galacticraft:titanium_ladder"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"values": [
"galacticraft:tin_ladder",
"galacticraft:aluminum_ladder",
"galacticraft:titanium_ladder",
"galacticraft:bronze_ladder",
"galacticraft:steel_ladder"
]
}
13 changes: 12 additions & 1 deletion src/main/java/dev/galacticraft/mod/Constant.java
Original file line number Diff line number Diff line change
Expand Up @@ -227,14 +227,25 @@ interface Block {
String DARK_DECORATION = "dark_decoration";

String IRON_GRATING = "iron_grating";
String TIN_LADDER = "tin_ladder";
String SQUARE_LIGHT_PANEL = "square_light_panel";
String SPOTLIGHT_LIGHT_PANEL = "spotlight_light_panel";
String LINEAR_LIGHT_PANEL = "linear_light_panel";
String DASHED_LIGHT_PANEL = "dashed_light_panel";
String DIAGONAL_LIGHT_PANEL = "diagonal_light_panel";
String VACUUM_GLASS = "vacuum_glass";
String CLEAR_VACUUM_GLASS = "vacuum_glass_clear";
String STRONG_VACUUM_GLASS = "vacuum_glass_strong";
String WALKWAY = "walkway";
String WIRE_WALKWAY = "wire_walkway";
String FLUID_PIPE_WALKWAY = "fluid_pipe_walkway";

// Ladders
String TIN_LADDER = "tin_ladder";
String ALUMINUM_LADDER = "aluminum_ladder";
String TITANIUM_LADDER = "titanium_ladder";
String BRONZE_LADDER = "bronze_ladder";
String STEEL_LADDER = "steel_ladder";

// Environment
String GLOWSTONE_TORCH = "glowstone_torch";
String GLOWSTONE_WALL_TORCH = "glowstone_wall_torch";
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/dev/galacticraft/mod/GalacticraftClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@ public void onInitializeClient() {
GCItemSubPredicates.init();

BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.TIN_LADDER, RenderType.cutout());
BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.ALUMINUM_LADDER, RenderType.cutout());
BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.TITANIUM_LADDER, RenderType.cutout());
BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.BRONZE_LADDER, RenderType.cutout());
BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.STEEL_LADDER, RenderType.cutout());

BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.WALKWAY, RenderType.cutout());
BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.WIRE_WALKWAY, RenderType.cutout());
BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.FLUID_PIPE_WALKWAY, RenderType.cutout());
Expand Down
Loading