Skip to content

Commit

Permalink
Revert "Added fences" (#585)
Browse files Browse the repository at this point in the history
  • Loading branch information
Makkkkus authored Nov 15, 2023
2 parents d764658 + 1147b77 commit bd2b40e
Show file tree
Hide file tree
Showing 24 changed files with 141 additions and 410 deletions.
284 changes: 140 additions & 144 deletions src/client/java/minicraft/item/Recipes.java

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions src/client/java/minicraft/item/TileItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,16 @@ protected static ArrayList<Item> getAllInstances() {
items.add(new TileItem("Plank", new LinkedSprite(SpriteType.Item, "plank"), new TileModel("Wood Planks"), "hole", "water", "cloud"));
items.add(new TileItem("Plank Wall", new LinkedSprite(SpriteType.Item, "plank_wall"), new TileModel("Wood Wall"), "Wood Planks"));
items.add(new TileItem("Wood Door", new LinkedSprite(SpriteType.Item, "wood_door"), new TileModel("Wood Door"), "Wood Planks"));
items.add(new TileItem("Wood Fence", new LinkedSprite(SpriteType.Item, "wood_fence"), new TileModel("Wood Fence"), "grass"));
items.add(new TileItem("Stone", new LinkedSprite(SpriteType.Item, "stone"), new TileModel("Stone"), "hole", "water", "cloud", "lava"));
items.add(new TileItem("Stone Brick", new LinkedSprite(SpriteType.Item, "stone_brick"), new TileModel("Stone Bricks"), "hole", "water", "cloud", "lava"));
items.add(new TileItem("Ornate Stone", new LinkedSprite(SpriteType.Item, "stone_brick"), new TileModel("Ornate Stone"), "hole", "water", "cloud", "lava"));
items.add(new TileItem("Stone Wall", new LinkedSprite(SpriteType.Item, "stone_wall"), new TileModel("Stone Wall"), "Stone Bricks"));
items.add(new TileItem("Stone Door", new LinkedSprite(SpriteType.Item, "stone_wall"), new TileModel("Stone Door"), "Stone Bricks"));
items.add(new TileItem("Stone Fence", new LinkedSprite(SpriteType.Item, "stone_fence"), new TileModel("Stone Fence"), "Stone Bricks"));
items.add(new TileItem("Raw Obsidian", new LinkedSprite(SpriteType.Item, "obsidian"), new TileModel("Raw Obsidian"), "hole", "water", "cloud", "lava"));
items.add(new TileItem("Obsidian Brick", new LinkedSprite(SpriteType.Item, "obsidian_brick"), new TileModel("Obsidian"), "hole", "water", "cloud", "lava"));
items.add(new TileItem("Ornate Obsidian", new LinkedSprite(SpriteType.Item, "obsidian_brick"), new TileModel("Ornate Obsidian"),"hole", "water", "cloud", "lava"));
items.add(new TileItem("Obsidian Wall", new LinkedSprite(SpriteType.Item, "obsidian_wall"), new TileModel("Obsidian Wall"), "Obsidian"));
items.add(new TileItem("Obsidian Door", new LinkedSprite(SpriteType.Item, "obsidian_door"), new TileModel("Obsidian Door"), "Obsidian"));
items.add(new TileItem("Obsidian Fence", new LinkedSprite(SpriteType.Item, "obsidian_fence"), new TileModel("Obsidian Fence"), "Obsidian"));

items.add(new TileItem("Wool", new LinkedSprite(SpriteType.Item, "wool"), new TileModel("Wool"), "hole", "water"));
items.add(new TileItem("Red Wool", new LinkedSprite(SpriteType.Item, "red_wool"), new TileModel("Red Wool"), "hole", "water"));
Expand Down
178 changes: 0 additions & 178 deletions src/client/java/minicraft/level/tile/FenceTile.java

This file was deleted.

3 changes: 0 additions & 3 deletions src/client/java/minicraft/level/tile/Tiles.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ public static void initTileList() {
tiles.put((short)47, new BossWallTile());
tiles.put((short)48, new BossFloorTile());
tiles.put((short)49, new BossDoorTile());
tiles.put((short)50, new FenceTile(Tile.Material.Wood));
tiles.put((short)51, new FenceTile(Tile.Material.Stone));
tiles.put((short)52, new FenceTile(Tile.Material.Obsidian));
tiles.put((short)50, new TomatoTile("Tomato"));
tiles.put((short)51, new CarrotTile("Carrot"));
tiles.put((short)52, new HeavenlyBerriesTile("Heavenly Berries"));
Expand Down
5 changes: 1 addition & 4 deletions src/client/resources/assets/localization/en-us.json
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,5 @@
"Infinite Fall": "Infinite Fall",
"Cloud Cactus": "Cloud Cactus",
"Raw Obsidian": "Raw Obsidian",
"Totem of Air": "Totem of Air",
"Wood Fence": "Wood Fence",
"Stone Fence": "Stone Fence",
"Obsidian Fence": "Obsidian Fence"
"Totem of Air": "Totem of Air"
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
78 changes: 0 additions & 78 deletions src/client/resources/resources/recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,32 +142,6 @@
}
}
},
"minicraft.advancements.recipes.wood_fence": {
"criteria": {
"has_plank": {
"trigger": "inventory_changed",
"conditions": {
"items": [
{
"items": [
"plank"
]
}
]
}
}
},
"requirements": [
[
"has_plank"
]
],
"rewards": {
"recipes": {
"Wood Fence_1": ["plank_3"]
}
}
},
"minicraft.advancements.recipes.lantern": {
"criteria": {
"has_wood": {
Expand Down Expand Up @@ -324,32 +298,6 @@
}
}
},
"minicraft.advancements.recipes.stone_fence": {
"criteria": {
"has_stone_brick": {
"trigger": "inventory_changed",
"conditions": {
"items": [
{
"items": [
"stone brick"
]
}
]
}
}
},
"requirements": [
[
"has_stone_brick"
]
],
"rewards": {
"recipes": {
"Stone Fence_1": ["Stone Brick_3"]
}
}
},
"minicraft.advancements.recipes.obsidian_brick": {
"criteria": {
"has_raw_obsidian": {
Expand Down Expand Up @@ -454,32 +402,6 @@
}
}
},
"minicraft.advancements.recipes.obsidian_fence": {
"criteria": {
"has_obsidian_brick": {
"trigger": "inventory_changed",
"conditions": {
"items": [
{
"items": [
"obsidian brick"
]
}
]
}
}
},
"requirements": [
[
"has_obsidian_brick"
]
],
"rewards": {
"recipes": {
"Obsidian Fence_1": ["Obsidian Brick_3"]
}
}
},
"minicraft.advancements.recipes.oven": {
"criteria": {
"has_stone": {
Expand Down

0 comments on commit bd2b40e

Please sign in to comment.