Skip to content

Commit

Permalink
Add new blocks and renamed blocks from 21w08a (#836)
Browse files Browse the repository at this point in the history 
* Add smooth basalt.

* Add the cobbled deepslate block, rename grimstone to deepslate.

* Add deepslate ores.
  • Loading branch information
@leMaik
leMaik committed Feb 27, 2021
1 parent f31d56f commit 0c47f70
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 61 deletions.
123 changes: 72 additions & 51 deletions chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
View file
Expand Up @@ -158,7 +158,7 @@ public class MinecraftBlockProvider implements BlockProvider {
"minecraft:chain",
"minecraft:chest",
"minecraft:chipped_anvil",
"minecraft:chiseled_grimstone",
"minecraft:chiseled_deepslate",
"minecraft:chiseled_nether_bricks",
"minecraft:chiseled_polished_blackstone",
"minecraft:chiseled_quartz_block",
Expand All @@ -171,6 +171,10 @@ public class MinecraftBlockProvider implements BlockProvider {
"minecraft:coal_block",
"minecraft:coal_ore",
"minecraft:coarse_dirt",
"minecraft:cobbled_deepslate",
"minecraft:cobbled_deepslate_wall",
"minecraft:cobbled_deepslate_slab",
"minecraft:cobbled_deepslate_stairs",
"minecraft:cobblestone",
"minecraft:cobblestone_slab",
"minecraft:cobblestone_stairs",
Expand Down Expand Up @@ -270,6 +274,20 @@ public class MinecraftBlockProvider implements BlockProvider {
"minecraft:dead_tube_coral_fan",
"minecraft:dead_tube_coral",
"minecraft:dead_tube_coral_wall_fan",
"minecraft:deepslate",
"minecraft:deepslate_bricks",
"minecraft:deepslate_brick_wall",
"minecraft:deepslate_brick_slab",
"minecraft:deepslate_brick_stairs",
"minecraft:deepslate_tiles",
"minecraft:deepslate_tile_wall",
"minecraft:deepslate_tile_slab",
"minecraft:deepslate_tile_stairs",
"minecraft:deepslate_gold_ore",
"minecraft:deepslate_iron_ore",
"minecraft:deepslate_diamond_ore",
"minecraft:deepslate_lapis_ore",
"minecraft:deepslate_redstone_ore",
"minecraft:detector_rail",
"minecraft:diamond_block",
"minecraft:diamond_ore",
Expand Down Expand Up @@ -354,18 +372,6 @@ public class MinecraftBlockProvider implements BlockProvider {
"minecraft:green_terracotta",
"minecraft:green_wall_banner",
"minecraft:green_wool",
"minecraft:grimstone",
"minecraft:grimstone_wall",
"minecraft:grimstone_slab",
"minecraft:grimstone_stairs",
"minecraft:grimstone_bricks",
"minecraft:grimstone_brick_wall",
"minecraft:grimstone_brick_slab",
"minecraft:grimstone_brick_stairs",
"minecraft:grimstone_tiles",
"minecraft:grimstone_tile_wall",
"minecraft:grimstone_tile_slab",
"minecraft:grimstone_tile_stairs",
"minecraft:grindstone",
"minecraft:hanging_roots",
"minecraft:hay_block",
Expand Down Expand Up @@ -595,10 +601,10 @@ public class MinecraftBlockProvider implements BlockProvider {
"minecraft:polished_granite",
"minecraft:polished_granite_slab",
"minecraft:polished_granite_stairs",
"minecraft:polished_grimstone",
"minecraft:polished_grimstone_wall",
"minecraft:polished_grimstone_slab",
"minecraft:polished_grimstone_stairs",
"minecraft:polished_deepslate",
"minecraft:polished_deepslate_wall",
"minecraft:polished_deepslate_slab",
"minecraft:polished_deepslate_stairs",
"minecraft:poppy",
"minecraft:potatoes",
"minecraft:potted_acacia_sapling",
Expand Down Expand Up @@ -726,6 +732,7 @@ public class MinecraftBlockProvider implements BlockProvider {
"minecraft:small_dripleaf",
"minecraft:smithing_table",
"minecraft:smoker",
"minecraft:smooth_basalt",
"minecraft:smooth_quartz",
"minecraft:smooth_quartz_slab",
"minecraft:smooth_quartz_stairs",
Expand Down Expand Up @@ -2786,40 +2793,54 @@ public Block getBlockByTag(String namespacedName, Tag tag) {
return new SmallDripleaf(tag.get("Properties").get("half").stringValue("lower"));
case "spore_blossom":
return new SporeBlossom();
case "grimstone":
return new MinecraftBlock(name, Texture.grimstone);
case "grimstone_wall":
return wall(tag, Texture.grimstone);
case "grimstone_slab":
return slab(tag, Texture.grimstone);
case "grimstone_stairs":
return stairs(tag, Texture.grimstone);
case "polished_grimstone":
return new MinecraftBlock(name, Texture.polishedGrimstone);
case "polished_grimstone_wall":
return wall(tag, Texture.polishedGrimstone);
case "polished_grimstone_slab":
return slab(tag, Texture.polishedGrimstone);
case "polished_grimstone_stairs":
return stairs(tag, Texture.polishedGrimstone);
case "grimstone_bricks":
return new MinecraftBlock(name, Texture.grimstoneBricks);
case "grimstone_brick_wall":
return wall(tag, Texture.grimstoneBricks);
case "grimstone_brick_slab":
return slab(tag, Texture.grimstoneBricks);
case "grimstone_brick_stairs":
return stairs(tag, Texture.grimstoneBricks);
case "grimstone_tiles":
return new MinecraftBlock(name, Texture.grimstoneTiles);
case "grimstone_tile_wall":
return wall(tag, Texture.grimstoneTiles);
case "grimstone_tile_slab":
return slab(tag, Texture.grimstoneTiles);
case "grimstone_tile_stairs":
return stairs(tag, Texture.grimstoneTiles);
case "chiseled_grimstone":
return new MinecraftBlock(name, Texture.chiseledGrimstone);
case "deepslate":
return new TexturedBlock(name, Texture.deepslate, Texture.deepslateTop);
case "deepslate_gold_ore":
return new MinecraftBlock(name, Texture.deepslateGoldOre);
case "deepslate_iron_ore":
return new MinecraftBlock(name, Texture.deepslateIronOre);
case "deepslate_diamond_ore":
return new MinecraftBlock(name, Texture.deepslateDiamondOre);
case "deepslate_lapis_ore":
return new MinecraftBlock(name, Texture.deepslateLapisOre);
case "deepslate_redstone_ore":
return new MinecraftBlock(name, Texture.deepslateRedstoneOre);
case "cobbled_deepslate":
return new MinecraftBlock(name, Texture.cobbledDeepslate);
case "cobbled_deepslate_wall":
return wall(tag, Texture.cobbledDeepslate);
case "cobbled_deepslate_slab":
return slab(tag, Texture.cobbledDeepslate);
case "cobbled_deepslate_stairs":
return stairs(tag, Texture.cobbledDeepslate);
case "polished_deepslate":
return new MinecraftBlock(name, Texture.polishedDeepslate);
case "polished_deepslate_wall":
return wall(tag, Texture.polishedDeepslate);
case "polished_deepslate_slab":
return slab(tag, Texture.polishedDeepslate);
case "polished_deepslate_stairs":
return stairs(tag, Texture.polishedDeepslate);
case "deepslate_bricks":
return new MinecraftBlock(name, Texture.deepslateBricks);
case "deepslate_brick_wall":
return wall(tag, Texture.deepslateBricks);
case "deepslate_brick_slab":
return slab(tag, Texture.deepslateBricks);
case "deepslate_brick_stairs":
return stairs(tag, Texture.deepslateBricks);
case "deepslate_tiles":
return new MinecraftBlock(name, Texture.deepslateTiles);
case "deepslate_tile_wall":
return wall(tag, Texture.deepslateTiles);
case "deepslate_tile_slab":
return slab(tag, Texture.deepslateTiles);
case "deepslate_tile_stairs":
return stairs(tag, Texture.deepslateTiles);
case "chiseled_deepslate":
return new MinecraftBlock(name, Texture.chiseledDeepslate);
case "smooth_basalt":
return new MinecraftBlock(name, Texture.smoothBasalt);
case "structure_void":
case "barrier":
// Invisible.
Expand Down
18 changes: 13 additions & 5 deletions chunky/src/java/se/llbit/chunky/resources/Texture.java
View file
Expand Up @@ -967,11 +967,19 @@ public class Texture {
public static final Texture smallDripleafStemBottom = new Texture();
public static final Texture sporeBlossom = new Texture();
public static final Texture sporeBlossomBase = new Texture();
public static final Texture grimstone = new Texture();
public static final Texture polishedGrimstone = new Texture();
public static final Texture chiseledGrimstone = new Texture();
public static final Texture grimstoneBricks = new Texture();
public static final Texture grimstoneTiles = new Texture();
public static final Texture deepslate = new Texture();
public static final Texture deepslateTop = new Texture();
public static final Texture polishedDeepslate = new Texture();
public static final Texture chiseledDeepslate = new Texture();
public static final Texture deepslateBricks = new Texture();
public static final Texture deepslateTiles = new Texture();
public static final Texture smoothBasalt = new Texture();
public static final Texture cobbledDeepslate = new Texture();
public static final Texture deepslateGoldOre = new Texture();
public static final Texture deepslateIronOre = new Texture();
public static final Texture deepslateDiamondOre = new Texture();
public static final Texture deepslateLapisOre = new Texture();
public static final Texture deepslateRedstoneOre = new Texture();

/** Banner base texture. */
public static final Texture bannerBase = new Texture();
Expand Down
18 changes: 13 additions & 5 deletions chunky/src/java/se/llbit/chunky/resources/TexturePackLoader.java
View file
Expand Up @@ -3593,11 +3593,19 @@ public class TexturePackLoader {
addSimpleTexture("assets/minecraft/textures/block/small_dripleaf_stem_bottom", Texture.smallDripleafStemBottom);
addSimpleTexture("assets/minecraft/textures/block/spore_blossom", Texture.sporeBlossom);
addSimpleTexture("assets/minecraft/textures/block/spore_blossom_base", Texture.sporeBlossomBase);
addSimpleTexture("assets/minecraft/textures/block/grimstone", Texture.grimstone);
addSimpleTexture("assets/minecraft/textures/block/polished_grimstone", Texture.polishedGrimstone);
addSimpleTexture("assets/minecraft/textures/block/chiseled_grimstone", Texture.chiseledGrimstone);
addSimpleTexture("assets/minecraft/textures/block/grimstone_bricks", Texture.grimstoneBricks);
addSimpleTexture("assets/minecraft/textures/block/grimstone_tiles", Texture.grimstoneTiles);
addSimpleTexture("assets/minecraft/textures/block/deepslate", Texture.deepslate);
addSimpleTexture("assets/minecraft/textures/block/deepslate_top", Texture.deepslateTop);
addSimpleTexture("assets/minecraft/textures/block/polished_deepslate", Texture.polishedDeepslate);
addSimpleTexture("assets/minecraft/textures/block/chiseled_deepslate", Texture.chiseledDeepslate);
addSimpleTexture("assets/minecraft/textures/block/deepslate_bricks", Texture.deepslateBricks);
addSimpleTexture("assets/minecraft/textures/block/deepslate_tiles", Texture.deepslateTiles);
addSimpleTexture("assets/minecraft/textures/block/smooth_basalt", Texture.smoothBasalt);
addSimpleTexture("assets/minecraft/textures/block/cobbled_deepslate", Texture.cobbledDeepslate);
addSimpleTexture("assets/minecraft/textures/block/deepslate_gold_ore", Texture.deepslateGoldOre);
addSimpleTexture("assets/minecraft/textures/block/deepslate_iron_ore", Texture.deepslateIronOre);
addSimpleTexture("assets/minecraft/textures/block/deepslate_diamond_ore", Texture.deepslateDiamondOre);
addSimpleTexture("assets/minecraft/textures/block/deepslate_lapis_ore", Texture.deepslateLapisOre);
addSimpleTexture("assets/minecraft/textures/block/deepslate_redstone_ore", Texture.deepslateRedstoneOre);
}

private static void addSimpleTexture(String file, Texture texture) {
Expand Down

0 comments on commit 0c47f70

Please sign in to comment.