Stripped name fix

This commit is contained in:
paulevsGitch 2020-10-03 01:40:15 +03:00
parent 81e62efcf6
commit baff425b70
49 changed files with 219 additions and 219 deletions

View file

@ -34,8 +34,8 @@ public class WoodenMaterial {
public final Block log;
public final Block bark;
public final Block log_striped;
public final Block bark_striped;
public final Block log_stripped;
public final Block bark_stripped;
public final Block planks;
@ -58,11 +58,11 @@ public class WoodenMaterial {
public WoodenMaterial(String name, MaterialColor woodColor, MaterialColor planksColor) {
FabricBlockSettings materialPlanks = FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).breakByTool(FabricToolTags.AXES).materialColor(planksColor);
log_striped = BlockRegistry.registerBlock(name + "_striped_log", new BlockPillar(materialPlanks));
bark_striped = BlockRegistry.registerBlock(name + "_striped_bark", new BlockPillar(materialPlanks));
log_stripped = BlockRegistry.registerBlock(name + "_stripped_log", new BlockPillar(materialPlanks));
bark_stripped = BlockRegistry.registerBlock(name + "_stripped_bark", new BlockPillar(materialPlanks));
log = BlockRegistry.registerBlock(name + "_log", new BlockLogStripable(woodColor, log_striped));
bark = BlockRegistry.registerBlock(name + "_bark", new BlockLogStripable(woodColor, bark_striped));
log = BlockRegistry.registerBlock(name + "_log", new BlockLogStripable(woodColor, log_stripped));
bark = BlockRegistry.registerBlock(name + "_bark", new BlockLogStripable(woodColor, bark_stripped));
planks = BlockRegistry.registerBlock(name + "_planks", new BlockBase(materialPlanks));
stairs = BlockRegistry.registerBlock(name + "_stairs", new BlockStairs(planks));
@ -82,7 +82,7 @@ public class WoodenMaterial {
barrel = BlockRegistry.registerBlock(name + "_barrel", new BlockBarrel(planks));
// Recipes //
RecipeBuilder.make(name + "_planks", planks).setOutputCount(4).setList("#").addMaterial('#', log, bark, log_striped, bark_striped).setGroup("end_planks").build();
RecipeBuilder.make(name + "_planks", planks).setOutputCount(4).setList("#").addMaterial('#', log, bark, log_stripped, bark_stripped).setGroup("end_planks").build();
RecipeBuilder.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', planks).setGroup("end_planks_stairs").build();
RecipeBuilder.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', planks).setGroup("end_planks_slabs").build();
RecipeBuilder.make(name + "_fence", fence).setOutputCount(3).setShape("#I#", "#I#").addMaterial('#', planks).addMaterial('I', Items.STICK).setGroup("end_planks_fences").build();
@ -100,8 +100,8 @@ public class WoodenMaterial {
// Item Tags //
TagHelper.addTag(ItemTags.PLANKS, planks);
TagHelper.addTag(ItemTags.WOODEN_PRESSURE_PLATES, pressure_plate);
TagHelper.addTag(ItemTags.LOGS, log, bark, log_striped, bark_striped);
TagHelper.addTag(ItemTags.LOGS_THAT_BURN, log, bark, log_striped, bark_striped);
TagHelper.addTag(ItemTags.LOGS, log, bark, log_stripped, bark_stripped);
TagHelper.addTag(ItemTags.LOGS_THAT_BURN, log, bark, log_stripped, bark_stripped);
TagHelper.addTags(button, ItemTags.WOODEN_BUTTONS, ItemTags.BUTTONS);
TagHelper.addTags(door, ItemTags.WOODEN_DOORS, ItemTags.DOORS);
@ -113,8 +113,8 @@ public class WoodenMaterial {
// Block Tags //
TagHelper.addTag(BlockTags.PLANKS, planks);
TagHelper.addTag(BlockTags.CLIMBABLE, ladder);
TagHelper.addTag(BlockTags.LOGS, log, bark, log_striped, bark_striped);
TagHelper.addTag(BlockTags.LOGS_THAT_BURN, log, bark, log_striped, bark_striped);
TagHelper.addTag(BlockTags.LOGS, log, bark, log_stripped, bark_stripped);
TagHelper.addTag(BlockTags.LOGS_THAT_BURN, log, bark, log_stripped, bark_stripped);
TagHelper.addTags(button, BlockTags.WOODEN_BUTTONS, BlockTags.BUTTONS);
TagHelper.addTags(door, BlockTags.WOODEN_DOORS, BlockTags.DOORS);

View file

@ -1,25 +0,0 @@
{
"variants": {
"axis=x": [
{ "model": "betterend:block/mossy_glowshroom_striped_bark", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_2", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_3", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_4", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_5", "x": 90, "y": 90 }
],
"axis=y": [
{ "model": "betterend:block/mossy_glowshroom_striped_bark" },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_2" },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_3" },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_4" },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_5" }
],
"axis=z": [
{ "model": "betterend:block/mossy_glowshroom_striped_bark", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_2", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_3", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_4", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_bark_5", "x": 90 }
]
}
}

View file

@ -1,25 +0,0 @@
{
"variants": {
"axis=x": [
{ "model": "betterend:block/mossy_glowshroom_striped_log", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_log_2", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_log_3", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_log_4", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_log_5", "x": 90, "y": 90 }
],
"axis=y": [
{ "model": "betterend:block/mossy_glowshroom_striped_log" },
{ "model": "betterend:block/mossy_glowshroom_striped_log_2" },
{ "model": "betterend:block/mossy_glowshroom_striped_log_3" },
{ "model": "betterend:block/mossy_glowshroom_striped_log_4" },
{ "model": "betterend:block/mossy_glowshroom_striped_log_5" }
],
"axis=z": [
{ "model": "betterend:block/mossy_glowshroom_striped_log", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_log_2", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_log_3", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_log_4", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_striped_log_5", "x": 90 }
]
}
}

View file

@ -0,0 +1,25 @@
{
"variants": {
"axis=x": [
{ "model": "betterend:block/mossy_glowshroom_stripped_bark", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_2", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_3", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_4", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_5", "x": 90, "y": 90 }
],
"axis=y": [
{ "model": "betterend:block/mossy_glowshroom_stripped_bark" },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_2" },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_3" },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_4" },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_5" }
],
"axis=z": [
{ "model": "betterend:block/mossy_glowshroom_stripped_bark", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_2", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_3", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_4", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_bark_5", "x": 90 }
]
}
}

View file

@ -0,0 +1,25 @@
{
"variants": {
"axis=x": [
{ "model": "betterend:block/mossy_glowshroom_stripped_log", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_2", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_3", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_4", "x": 90, "y": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_5", "x": 90, "y": 90 }
],
"axis=y": [
{ "model": "betterend:block/mossy_glowshroom_stripped_log" },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_2" },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_3" },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_4" },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_5" }
],
"axis=z": [
{ "model": "betterend:block/mossy_glowshroom_stripped_log", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_2", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_3", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_4", "x": 90 },
{ "model": "betterend:block/mossy_glowshroom_stripped_log_5", "x": 90 }
]
}
}

View file

@ -55,8 +55,8 @@
"block.betterend.mossy_glowshroom_sign": "Mossy Glowshroom Sign",
"block.betterend.mossy_glowshroom_slab": "Mossy Glowshroom Slab",
"block.betterend.mossy_glowshroom_stairs": "Mossy Glowshroom Stairs",
"block.betterend.mossy_glowshroom_striped_bark": "Mossy Glowshroom Striped Bark",
"block.betterend.mossy_glowshroom_striped_log": "Mossy Glowshroom Striped Log",
"block.betterend.mossy_glowshroom_stripped_bark": "Mossy Glowshroom Stripped Bark",
"block.betterend.mossy_glowshroom_stripped_log": "Mossy Glowshroom Stripped Log",
"block.betterend.mossy_glowshroom_trapdoor": "Mossy Glowshroom Trapdoor",
"block.betterend.umbrella_moss": "Umbrella Moss",

View file

@ -55,8 +55,8 @@
"block.betterend.mossy_glowshroom_sign": "Табличка из мшистого светогриба",
"block.betterend.mossy_glowshroom_slab": "Плита из мшистого светогриба",
"block.betterend.mossy_glowshroom_stairs": "Ступени из мшистого светогриба",
"block.betterend.mossy_glowshroom_striped_bark": "Обтёсанная кора из мшистого светогриба",
"block.betterend.mossy_glowshroom_striped_log": "Обтёсанное бревно из мшистого светогриба",
"block.betterend.mossy_glowshroom_stripped_bark": "Обтёсанная кора из мшистого светогриба",
"block.betterend.mossy_glowshroom_stripped_log": "Обтёсанное бревно из мшистого светогриба",
"block.betterend.mossy_glowshroom_trapdoor": "Люк из мшистого светогриба",
"block.betterend.umbrella_moss": "Зонтичный мох",

View file

@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_striped_log_side"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_striped_log_side_2"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_striped_log_side_3"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_striped_log_side_4"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_striped_log_side_5"
}
}

View file

@ -1,12 +0,0 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_striped_log_top",
"east": "betterend:block/mossy_glowshroom_striped_log_side",
"north": "betterend:block/mossy_glowshroom_striped_log_side",
"particle": "betterend:block/mossy_glowshroom_striped_log_side",
"south": "betterend:block/mossy_glowshroom_striped_log_side",
"up": "betterend:block/mossy_glowshroom_striped_log_top",
"west": "betterend:block/mossy_glowshroom_striped_log_side"
}
}

View file

@ -1,12 +0,0 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_striped_log_top",
"east": "betterend:block/mossy_glowshroom_striped_log_side_2",
"north": "betterend:block/mossy_glowshroom_striped_log_side_2",
"particle": "betterend:block/mossy_glowshroom_striped_log_side_2",
"south": "betterend:block/mossy_glowshroom_striped_log_side_2",
"up": "betterend:block/mossy_glowshroom_striped_log_top",
"west": "betterend:block/mossy_glowshroom_striped_log_side_2"
}
}

View file

@ -1,12 +0,0 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_striped_log_top",
"east": "betterend:block/mossy_glowshroom_striped_log_side_3",
"north": "betterend:block/mossy_glowshroom_striped_log_side_3",
"particle": "betterend:block/mossy_glowshroom_striped_log_side_3",
"south": "betterend:block/mossy_glowshroom_striped_log_side_3",
"up": "betterend:block/mossy_glowshroom_striped_log_top",
"west": "betterend:block/mossy_glowshroom_striped_log_side_3"
}
}

View file

@ -1,12 +0,0 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_striped_log_top",
"east": "betterend:block/mossy_glowshroom_striped_log_side_4",
"north": "betterend:block/mossy_glowshroom_striped_log_side_4",
"particle": "betterend:block/mossy_glowshroom_striped_log_side_4",
"south": "betterend:block/mossy_glowshroom_striped_log_side_4",
"up": "betterend:block/mossy_glowshroom_striped_log_top",
"west": "betterend:block/mossy_glowshroom_striped_log_side_4"
}
}

View file

@ -1,12 +0,0 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_striped_log_top",
"east": "betterend:block/mossy_glowshroom_striped_log_side_5",
"north": "betterend:block/mossy_glowshroom_striped_log_side_5",
"particle": "betterend:block/mossy_glowshroom_striped_log_side_5",
"south": "betterend:block/mossy_glowshroom_striped_log_side_5",
"up": "betterend:block/mossy_glowshroom_striped_log_top",
"west": "betterend:block/mossy_glowshroom_striped_log_side_5"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_stripped_log_side"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_stripped_log_side_2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_stripped_log_side_3"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_stripped_log_side_4"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/mossy_glowshroom_stripped_log_side_5"
}
}

View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_stripped_log_top",
"east": "betterend:block/mossy_glowshroom_stripped_log_side",
"north": "betterend:block/mossy_glowshroom_stripped_log_side",
"particle": "betterend:block/mossy_glowshroom_stripped_log_side",
"south": "betterend:block/mossy_glowshroom_stripped_log_side",
"up": "betterend:block/mossy_glowshroom_stripped_log_top",
"west": "betterend:block/mossy_glowshroom_stripped_log_side"
}
}

View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_stripped_log_top",
"east": "betterend:block/mossy_glowshroom_stripped_log_side_2",
"north": "betterend:block/mossy_glowshroom_stripped_log_side_2",
"particle": "betterend:block/mossy_glowshroom_stripped_log_side_2",
"south": "betterend:block/mossy_glowshroom_stripped_log_side_2",
"up": "betterend:block/mossy_glowshroom_stripped_log_top",
"west": "betterend:block/mossy_glowshroom_stripped_log_side_2"
}
}

View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_stripped_log_top",
"east": "betterend:block/mossy_glowshroom_stripped_log_side_3",
"north": "betterend:block/mossy_glowshroom_stripped_log_side_3",
"particle": "betterend:block/mossy_glowshroom_stripped_log_side_3",
"south": "betterend:block/mossy_glowshroom_stripped_log_side_3",
"up": "betterend:block/mossy_glowshroom_stripped_log_top",
"west": "betterend:block/mossy_glowshroom_stripped_log_side_3"
}
}

View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_stripped_log_top",
"east": "betterend:block/mossy_glowshroom_stripped_log_side_4",
"north": "betterend:block/mossy_glowshroom_stripped_log_side_4",
"particle": "betterend:block/mossy_glowshroom_stripped_log_side_4",
"south": "betterend:block/mossy_glowshroom_stripped_log_side_4",
"up": "betterend:block/mossy_glowshroom_stripped_log_top",
"west": "betterend:block/mossy_glowshroom_stripped_log_side_4"
}
}

View file

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/mossy_glowshroom_stripped_log_top",
"east": "betterend:block/mossy_glowshroom_stripped_log_side_5",
"north": "betterend:block/mossy_glowshroom_stripped_log_side_5",
"particle": "betterend:block/mossy_glowshroom_stripped_log_side_5",
"south": "betterend:block/mossy_glowshroom_stripped_log_side_5",
"up": "betterend:block/mossy_glowshroom_stripped_log_top",
"west": "betterend:block/mossy_glowshroom_stripped_log_side_5"
}
}

View file

@ -1,3 +0,0 @@
{
"parent": "betterend:block/mossy_glowshroom_striped_bark"
}

View file

@ -1,3 +0,0 @@
{
"parent": "betterend:block/mossy_glowshroom_striped_log"
}

View file

@ -0,0 +1,3 @@
{
"parent": "betterend:block/mossy_glowshroom_stripped_bark"
}

View file

@ -0,0 +1,3 @@
{
"parent": "betterend:block/mossy_glowshroom_stripped_log"
}