From 88654fdf9d145540ad31e3e9f67145906aa8cea9 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 12 Aug 2018 02:32:55 -0500 Subject: [PATCH] Add/fix more 1.13 blocks --- .../java/org/dynmap/hdmap/HDBlockModels.java | 15 ++ DynmapCore/src/main/resources/models_1.txt | 58 +++---- DynmapCore/src/main/resources/texture_1.txt | 150 +++++++++--------- .../org.eclipse.core.resources.prefs | 1 - 4 files changed, 123 insertions(+), 101 deletions(-) diff --git a/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java b/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java index ce77ea3b..6c1b8b53 100644 --- a/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java +++ b/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java @@ -392,6 +392,9 @@ public class HDBlockModels { modlist.add(new HDBlockVolumetricModel(bblk.blockName, databits, scale, new long[0], blockset)); cnt++; } + else { + Log.severe("Invalid model block name " + bname + " at line " + rdr.getLineNumber()); + } } } else { @@ -543,6 +546,9 @@ public class HDBlockModels { changeIgnoredBlocks.set(bs.globalStateIndex); } } + else { + Log.severe("Invalid update ignore block name " + nm + " at line " + rdr.getLineNumber()); + } } } else if(line.startsWith("#") || line.startsWith(";")) { @@ -735,6 +741,9 @@ public class HDBlockModels { pmodlist.add(new HDBlockPatchModel(bs.blockName, databits, patcharray, blockset)); cnt++; } + else { + Log.severe("Invalid patchmodel block name " + nm + " at line " + rdr.getLineNumber()); + } } } else { @@ -796,6 +805,9 @@ public class HDBlockModels { pmodlist.add(new HDBlockPatchModel(bs.blockName, databits, patcharray, blockset)); cnt++; } + else { + Log.severe("Invalid boxmodel block name " + nm + " at line " + rdr.getLineNumber()); + } } } else { @@ -851,6 +863,9 @@ public class HDBlockModels { } cnt++; } + else { + Log.severe("Invalid custommodel block name " + nm + " at line " + rdr.getLineNumber()); + } } } else { diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 42129694..160adf02 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -356,7 +356,7 @@ patchblock:id=standing_sign,data=11,patch0=SignFront@67,patch1=SignBack@67,patch # Fire patchblock:id=fire,data=*,patch0=VertX0,patch1=VertX0@90,patch2=VertX0@180,patch3=VertX0@270,patch4=SlopeXUpZTop675,patch5=SlopeXUpZTop675@90,patch6=SlopeXUpZTop675@180,patch4=SlopeXUpZTop675@270 # Bed - head - pointing west -block:id=bed,data=8,scale=16 +block:id=white_bed,id=orange_bed,id=magenta_bed,id=light_blue_bed,id=yellow_bed,id=lime_bed,id=pink_bed,id=gray_bed,id=light_gray_bed,id=cyan_bed,id=purple_bed,id=blue_bed,id=brown_bed,id=green_bed,id=red_bed,id=black_bed,data=8,scale=16 layer:0,1,2 ***------------- ***------------- @@ -409,16 +409,16 @@ layer:9 -******--------- ---------------- # Bed - head - pointing north -block:id=bed,data=9,scale=16 -rotate:id=bed,data=8,rot=90 +block:id=white_bed,id=orange_bed,id=magenta_bed,id=light_blue_bed,id=yellow_bed,id=lime_bed,id=pink_bed,id=gray_bed,id=light_gray_bed,id=cyan_bed,id=purple_bed,id=blue_bed,id=brown_bed,id=green_bed,id=red_bed,id=black_bed,data=9,scale=16 +rotate:id=white_bed,data=8,rot=90 # Bed - head - pointing east -block:id=bed,data=10,scale=16 -rotate:id=bed,data=8,rot=180 +block:id=white_bed,id=orange_bed,id=magenta_bed,id=light_blue_bed,id=yellow_bed,id=lime_bed,id=pink_bed,id=gray_bed,id=light_gray_bed,id=cyan_bed,id=purple_bed,id=blue_bed,id=brown_bed,id=green_bed,id=red_bed,id=black_bed,data=10,scale=16 +rotate:id=white_bed,data=8,rot=180 # Bed - head - pointing south -block:id=bed,data=11,scale=16 -rotate:id=bed,data=8,rot=270 +block:id=white_bed,id=orange_bed,id=magenta_bed,id=light_blue_bed,id=yellow_bed,id=lime_bed,id=pink_bed,id=gray_bed,id=light_gray_bed,id=cyan_bed,id=purple_bed,id=blue_bed,id=brown_bed,id=green_bed,id=red_bed,id=black_bed,data=11,scale=16 +rotate:id=white_bed,data=8,rot=270 # Bed - foot - pointing west -block:id=bed,data=0,scale=16 +block:id=white_bed,id=orange_bed,id=magenta_bed,id=light_blue_bed,id=yellow_bed,id=lime_bed,id=pink_bed,id=gray_bed,id=light_gray_bed,id=cyan_bed,id=purple_bed,id=blue_bed,id=brown_bed,id=green_bed,id=red_bed,id=black_bed,data=0,scale=16 layer:0,1,2 -------------*** -------------*** @@ -454,14 +454,14 @@ layer:3,4,5,6,7,8 **************** **************** # Bed - foot - pointing north -block:id=bed,data=1,scale=16 -rotate:id=bed,data=0,rot=90 +block:id=white_bed,id=orange_bed,id=magenta_bed,id=light_blue_bed,id=yellow_bed,id=lime_bed,id=pink_bed,id=gray_bed,id=light_gray_bed,id=cyan_bed,id=purple_bed,id=blue_bed,id=brown_bed,id=green_bed,id=red_bed,id=black_bed,data=1,scale=16 +rotate:id=white_bed,data=0,rot=90 # Bed - foot - pointing east -block:id=bed,data=2,scale=16 -rotate:id=bed,data=0,rot=180 +block:id=white_bed,id=orange_bed,id=magenta_bed,id=light_blue_bed,id=yellow_bed,id=lime_bed,id=pink_bed,id=gray_bed,id=light_gray_bed,id=cyan_bed,id=purple_bed,id=blue_bed,id=brown_bed,id=green_bed,id=red_bed,id=black_bed,data=2,scale=16 +rotate:id=white_bed,data=0,rot=180 # Bed - foot - pointing south -block:id=bed,data=3,scale=16 -rotate:id=bed,data=0,rot=270 +block:id=white_bed,id=orange_bed,id=magenta_bed,id=light_blue_bed,id=yellow_bed,id=lime_bed,id=pink_bed,id=gray_bed,id=light_gray_bed,id=cyan_bed,id=purple_bed,id=blue_bed,id=brown_bed,id=green_bed,id=red_bed,id=black_bed,data=3,scale=16 +rotate:id=white_bed,data=0,rot=270 # Wooden/Iron Door customblock:id=wooden_door,id=iron_door,data=*,class=org.dynmap.hdmap.renderer.DoorRenderer @@ -498,7 +498,7 @@ patchrotate:id=lever,data=14,rotx=180 patchblock:id=cactus,data=*,patch0=VertX00625,patch1=VertX00625@90,patch2=VertX00625@180,patch3=VertX00625@270,patch4=HorizY100ZTop,patch5=HorizY100ZTop@180/0/0 # Redstone repeater (on) facing east # Redstone repeater (off) facing east -block:id=unpowered_repeater,id=powered_repeater,data=0,data=4,data=8,data=12,scale=16 +block:id=repeater,data=0,data=1,data=2,data=3,data=16,data=17,data=18,data=19,data=32,data=33,data=34,data=35,data=48,data=49,data=50,data=51,scale=16 layer:0,1 **************** **************** @@ -535,16 +535,16 @@ layer:2,3,4,5,6,7,8,9 ---------------- # Redstone repeater (on) facing south # Redstone repeater (off) facing south -block:id=unpowered_repeater,id=powered_repeater,data=1,data=5,data=9,data=13,scale=16 -rotate:id=unpowered_repeater,data=0,rot=90 +block:id=repeater,data=4,data=5,data=6,data=7,data=20,data=21,data=22,data=23,data=36,data=37,data=38,data=39,data=52,data=53,data=54,data=55,scale=16 +rotate:id=repeater,data=0,rot=90 # Redstone repeater (on) facing west # Redstone repeater (off) facing west -block:id=unpowered_repeater,id=powered_repeater,data=2,data=6,data=10,data=14,scale=16 -rotate:id=unpowered_repeater,data=0,rot=180 +block:id=repeater,data=8,data=9,data=10,data=11,data=24,data=25,data=26,data=27,data=40,data=41,data=42,data=43,data=56,data=57,data=58,data=59,scale=16 +rotate:id=repeater,data=0,rot=180 # Redstone repeater (on) facing north # Redstone repeater (off) facing north -block:id=unpowered_repeater,id=powered_repeater,data=3,data=7,data=11,data=15,scale=16 -rotate:id=unpowered_repeater,data=0,rot=270 +block:id=repeater,data=12,data=13,data=14,data=15,data=28,data=29,data=30,data=31,data=44,data=45,data=46,data=47,data=60,data=61,data=62,data=63,scale=16 +rotate:id=repeater,data=0,rot=270 # Sticky piston - extended facing down # Piston - extended facing down block:id=sticky_piston,id=piston,data=8,scale=8 @@ -707,7 +707,7 @@ customblock:id=glass_pane,id=iron_bars,data=*,class=org.dynmap.hdmap.renderer.Pa # Dead schrub (tall grass) # Sapling # Sugar Cane -patchblock:id=sapling,id=web,id=tallgrass,id=deadbush,id=yellow_flower,id=red_flower,id=brown_mushroom,id=red_mushroom,id=reeds,id=nether_wart,data=*,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90 +patchblock:id=sapling,id=cobweb,id=tallgrass,id=deadbush,id=yellow_flower,id=red_flower,id=brown_mushroom,id=red_mushroom,id=reeds,id=nether_wart,data=*,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90 # Vines - N side of block patchblock:id=vine,data=2,patch0=VertX0In @@ -1012,7 +1012,7 @@ boxblock:id=daylight_detector,data=*,ymax=0.375 # (149) Redstone Comparator (inactive) # (150) Redstone Comparator (active) -block:id=unpowered_comparator,id=powered_comparator,data=0,data=4,data=8,data=12,scale=16 +block:id=comparator,data=0,data=1,data=2,data=3,scale=16 layer:0,1 **************** **************** @@ -1064,12 +1064,12 @@ layer:4,5,6 ---------------- ---------------- ---------------- -block:id=unpowered_comparator,id=powered_comparator,data=1,data=5,data=9,data=13,scale=16 -rotate:id=unpowered_comparator,data=0,rot=90 -block:id=unpowered_comparator,id=powered_comparator,data=2,data=6,data=10,data=14,scale=16 -rotate:id=unpowered_comparator,data=0,rot=180 -block:id=unpowered_comparator,id=powered_comparator,data=3,data=7,data=11,data=15,scale=16 -rotate:id=unpowered_comparator,data=0,rot=270 +block:id=comparator,data=4,data=5,data=6,data=7,scale=16 +rotate:id=comparator,data=0,rot=90 +block:id=comparator,,data=8,data=9,data=10,data=11,scale=16 +rotate:id=comparator,data=0,rot=180 +block:id=comparator,data=12,data=13,data=14,data=15,scale=16 +rotate:id=comparator,data=0,rot=270 # (154) Hopper block:id=hopper,data=*,scale=16 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 29120617..1e1db54e 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -48,7 +48,7 @@ texturefile:id=yellow_bed,filename=assets/minecraft/textures/entity/bed/yellow.p texturefile:id=lime_bed,filename=assets/minecraft/textures/entity/bed/lime.png,format=BED texturefile:id=pink_bed,filename=assets/minecraft/textures/entity/bed/pink.png,format=BED texturefile:id=gray_bed,filename=assets/minecraft/textures/entity/bed/gray.png,format=BED -texturefile:id=silver_bed,filename=assets/minecraft/textures/entity/bed/silver.png,format=BED +texturefile:id=light_gray_bed,filename=assets/minecraft/textures/entity/bed/light_gray.png,format=BED texturefile:id=cyan_bed,filename=assets/minecraft/textures/entity/bed/cyan.png,format=BED texturefile:id=purple_bed,filename=assets/minecraft/textures/entity/bed/purple.png,format=BED texturefile:id=blue_bed,filename=assets/minecraft/textures/entity/bed/blue.png,format=BED @@ -99,22 +99,22 @@ texture:id=hardened_clay_stained_white texture:id=hardened_clay_stained_yellow texture:id=hay_block_side texture:id=hay_block_top -texture:id=wool_colored_black -texture:id=wool_colored_blue -texture:id=wool_colored_brown -texture:id=wool_colored_cyan -texture:id=wool_colored_gray -texture:id=wool_colored_green -texture:id=wool_colored_light_blue -texture:id=wool_colored_lime -texture:id=wool_colored_magenta -texture:id=wool_colored_orange -texture:id=wool_colored_pink -texture:id=wool_colored_purple -texture:id=wool_colored_red -texture:id=wool_colored_silver -texture:id=wool_colored_white -texture:id=wool_colored_yellow +texture:id=black_wool +texture:id=blue_wool +texture:id=brown_wool +texture:id=cyan_wool +texture:id=gray_wool +texture:id=green_wool +texture:id=light_blue_wppl +texture:id=lime_wool +texture:id=magenta_wool +texture:id=orange_wool +texture:id=pink_wool +texture:id=purple_wool +texture:id=red_wool +texture:id=light_gray_wool +texture:id=white_wool +texture:id=yellow_wool texture:id=hardened_clay texture:id=coal_block texture:id=stone @@ -199,9 +199,14 @@ texture:id=stone_slab_top texture:id=stonebrick texture:id=nether_brick texture:id=brick -texture:id=web -texture:id=deadbush -texture:id=tallgrass +texture:id=cobweb +texture:id=dead_bush +texture:id=grass +texture:id=tall_grass +texture:id=dead_bush +texture:id=seagrass +texture:id=tall_seagrass_top +texture:id=tall_seagrass_bottom texture:id=fern texture:id=tnt_bottom texture:id=tnt_side @@ -812,15 +817,18 @@ block:id=sticky_piston,data=12,north=0:piston_inner,south=0:piston_bottom,top=26 # Sticky piston - extended facing south (TODO: side) block:id=sticky_piston,data=13,north=0:piston_bottom,south=0:piston_inner,top=5262,bottom=262,east=4262,west=6262,transparency=TRANSPARENT # Web -block:id=web,patch0-1=0:web,transparency=TRANSPARENT -# Dead shrub -block:id=tallgrass,data=0,patch0-1=0:deadbush,transparency=TRANSPARENT -# Tall Grass -block:id=tallgrass,data=1,patch0-1=1000:tallgrass,transparency=TRANSPARENT +block:id=cobweb,patch0-1=0:cobweb,transparency=TRANSPARENT +# Grass +block:id=grass,patch0-1=1000:grass,transparency=TRANSPARENT # Fern -block:id=tallgrass,data=2,patch0-1=1000:fern,transparency=TRANSPARENT +block:id=fern,patch0-1=1000:fern,transparency=TRANSPARENT # Dead shrub -block:id=deadbush,patch0-1=0:deadbush,transparency=TRANSPARENT +block:id=dead_bush,patch0-1=0:dead_bush,transparency=TRANSPARENT +# Seagrass +block:id=seagrass,patch0-1=1000:seagrass,transparency=TRANSPARENT +# Tall seagrass +block:id=seagrass,data=0,patch0-1=1000:tall_seagrass_top,transparency=TRANSPARENT +block:id=seagrass,data=1.patch0-1=1000:tall_seagrass_bottom,transparency=TRANSPARENT # Piston - facing down block:id=piston,data=0,top=0:piston_bottom,bottom=0:piston_top_normal,allsides=5000:piston_side,transparency=TRANSPARENT # Piston - facing up @@ -834,17 +842,17 @@ block:id=piston,data=4,north=0:piston_top_normal,south=0:piston_bottom,top=0:pis # Piston - facing south block:id=piston,data=5,north=0:piston_bottom,south=0:piston_top_normal,top=5000:piston_side,bottom=0:piston_side,east=4000:piston_side,west=6000:piston_side,transparency=TRANSPARENT # Piston - extended facing down (TODO:piston extension side) -block:id=piston,data=8,top=0:piston_bottom,bottom=0:piston_inner,allsides=5262,transparency=TRANSPARENT +block:id=piston,data=6,top=0:piston_bottom,bottom=0:piston_inner,allsides=5262,transparency=TRANSPARENT # Piston - extended facing up (TODO:piston extension side) -block:id=piston,data=9,top=0:piston_inner,bottom=0:piston_bottom,allsides=262,transparency=TRANSPARENT +block:id=piston,data=7,top=0:piston_inner,bottom=0:piston_bottom,allsides=262,transparency=TRANSPARENT # Piston - extended facing east (TODO:piston extension side) -block:id=piston,data=10,east=0:piston_inner,west=0:piston_bottom,top=6262,bottom=4262,north=4262,south=6262,transparency=TRANSPARENT +block:id=piston,data=8,east=0:piston_inner,west=0:piston_bottom,top=6262,bottom=4262,north=4262,south=6262,transparency=TRANSPARENT # Piston - extended facing west (TODO:piston extension side) -block:id=piston,data=11,west=0:piston_inner,east=0:piston_bottom,top=4262,bottom=6262,north=6262,south=4262,transparency=TRANSPARENT +block:id=piston,data=9,west=0:piston_inner,east=0:piston_bottom,top=4262,bottom=6262,north=6262,south=4262,transparency=TRANSPARENT # Piston - extended facing north (TODO:piston extension side) -block:id=piston,data=12,north=0:piston_inner,south=0:piston_bottom,top=262,bottom=5262,east=6262,west=4262,transparency=TRANSPARENT +block:id=piston,data=10,north=0:piston_inner,south=0:piston_bottom,top=262,bottom=5262,east=6262,west=4262,transparency=TRANSPARENT # Piston - extended facing south (TODO:piston extension side) -block:id=piston,data=13,north=0:piston_bottom,south=0:piston_inner,top=5262,bottom=262,east=4262,west=6262,transparency=TRANSPARENT +block:id=piston,data=11,north=0:piston_bottom,south=0:piston_inner,top=5262,bottom=262,east=4262,west=6262,transparency=TRANSPARENT # Piston extension- facing down (TODO:piston extension side) block:id=piston_head,data=0,top=0:piston_inner,bottom=0:piston_top_normal,allsides=5261,transparency=TRANSPARENT # Piston extension - facing up (TODO:piston extension side) @@ -858,34 +866,34 @@ block:id=piston_head,data=4,north=0:piston_top_normal,south=0:piston_inner,top=2 # Piston extension - facing south (TODO:piston extension side) block:id=piston_head,data=5,north=0:piston_inner,south=0:piston_top_normal,top=5261,bottom=261,east=4261,west=6261,transparency=TRANSPARENT # Sticky piston extension - facing down (TODO:piston extension side) -block:id=piston_head,data=8,top=0:piston_inner,bottom=0:piston_top_sticky,allsides=5261,transparency=TRANSPARENT +block:id=piston_head,data=6,top=0:piston_inner,bottom=0:piston_top_sticky,allsides=5261,transparency=TRANSPARENT # Sticky piston extension - facing up (TODO:piston extension side) -block:id=piston_head,data=9,top=0:piston_top_sticky,bottom=0:piston_inner,allsides=261,transparency=TRANSPARENT +block:id=piston_head,data=7,top=0:piston_top_sticky,bottom=0:piston_inner,allsides=261,transparency=TRANSPARENT # Sticky piston extension - facing east (TODO:piston extension side) -block:id=piston_head,data=10,east=0:piston_top_sticky,west=0:piston_inner,top=6261,bottom=4261,north=4261,south=6261,transparency=TRANSPARENT +block:id=piston_head,data=8,east=0:piston_top_sticky,west=0:piston_inner,top=6261,bottom=4261,north=4261,south=6261,transparency=TRANSPARENT # Sticky piston extension - facing west (TODO:piston extension side) -block:id=piston_head,data=11,west=0:piston_top_sticky,east=0:piston_inner,top=4261,bottom=6261,north=6261,south=4261,transparency=TRANSPARENT +block:id=piston_head,data=9,west=0:piston_top_sticky,east=0:piston_inner,top=4261,bottom=6261,north=6261,south=4261,transparency=TRANSPARENT # Sticky piston extension - facing north (TODO:piston extension side) -block:id=piston_head,data=12,north=0:piston_top_sticky,south=0:piston_inner,top=261,bottom=5261,east=6261,west=4261,transparency=TRANSPARENT +block:id=piston_head,data=10,north=0:piston_top_sticky,south=0:piston_inner,top=261,bottom=5261,east=6261,west=4261,transparency=TRANSPARENT # Sticky piston extension - facing south (TODO:piston extension side) -block:id=piston_head,data=13,north=0:piston_inner,south=0:piston_top_sticky,top=5261,bottom=261,east=4261,west=6261,transparency=TRANSPARENT +block:id=piston_head,data=11,north=0:piston_inner,south=0:piston_top_sticky,top=5261,bottom=261,east=4261,west=6261,transparency=TRANSPARENT # Wool -block:id=wool,data=0,allfaces=0:wool_colored_white,stdrot=true -block:id=wool,data=1,allfaces=0:wool_colored_orange,stdrot=true -block:id=wool,data=2,allfaces=0:wool_colored_magenta,stdrot=true -block:id=wool,data=3,allfaces=0:wool_colored_light_blue,stdrot=true -block:id=wool,data=4,allfaces=0:wool_colored_yellow,stdrot=true -block:id=wool,data=5,allfaces=0:wool_colored_lime,stdrot=true -block:id=wool,data=6,allfaces=0:wool_colored_pink,stdrot=true -block:id=wool,data=7,allfaces=0:wool_colored_gray,stdrot=true -block:id=wool,data=8,allfaces=0:wool_colored_silver,stdrot=true -block:id=wool,data=9,allfaces=0:wool_colored_cyan,stdrot=true -block:id=wool,data=10,allfaces=0:wool_colored_purple,stdrot=true -block:id=wool,data=11,allfaces=0:wool_colored_blue,stdrot=true -block:id=wool,data=12,allfaces=0:wool_colored_brown,stdrot=true -block:id=wool,data=13,allfaces=0:wool_colored_green,stdrot=true -block:id=wool,data=14,allfaces=0:wool_colored_red,stdrot=true -block:id=wool,data=15,allfaces=0:wool_colored_black,stdrot=true +block:id=white_wool,allfaces=0:white_wool,stdrot=true +block:id=orange_wool,allfaces=0:orange_wool,stdrot=true +block:id=magenta_wool,allfaces=0:magenta_wool,stdrot=true +block:id=light_blue_wool,allfaces=0:light_blue_wool,stdrot=true +block:id=yellow_wool,allfaces=0:yellow_wool,stdrot=true +block:id=lime_wool,allfaces=0:lime_wool,stdrot=true +block:id=pink_wool,allfaces=0:pink_wool,stdrot=true +block:id=gray_wool,allfaces=0:gray_wool,stdrot=true +block:id=light_gray_wool,allfaces=0:light_gray_wool,stdrot=true +block:id=cyan_wool,allfaces=0:cyan_wool,stdrot=true +block:id=purple_wool,allfaces=0:purple_wool,stdrot=true +block:id=blue_wool,dallfaces=0:blue_wool,stdrot=true +block:id=brown_wool,allfaces=0:brown_wool,stdrot=true +block:id=green_wool,allfaces=0:green_wool,stdrot=true +block:id=red_wool,allfaces=0:red_wool,stdrot=true +block:id=black_wool,allfaces=0:black_wool,stdrot=true # Dandelion block:id=yellow_flower,patch0-1=0:flower_dandelion,transparency=TRANSPARENT # Rose @@ -1466,22 +1474,22 @@ block:id=dark_oak_stairs,data=*,patch0-2=0:dark_oak_planks,transparency=SEMITRAN # (170) Hay block:id=hay_block,data=*,allsides=0:hay_block_side,topbottom=0:hay_block_top,stdrot=true # (171) Carpet -block:id=carpet,data=15,stdrot=true,allfaces=0:wool_colored_black -block:id=carpet,data=14,stdrot=true,allfaces=0:wool_colored_red -block:id=carpet,data=13,stdrot=true,allfaces=0:wool_colored_green -block:id=carpet,data=12,stdrot=true,allfaces=0:wool_colored_brown -block:id=carpet,data=11,stdrot=true,allfaces=0:wool_colored_blue -block:id=carpet,data=10,stdrot=true,allfaces=0:wool_colored_purple -block:id=carpet,data=9,stdrot=true,allfaces=0:wool_colored_cyan -block:id=carpet,data=8,stdrot=true,allfaces=0:wool_colored_silver -block:id=carpet,data=7,stdrot=true,allfaces=0:wool_colored_gray -block:id=carpet,data=6,stdrot=true,allfaces=0:wool_colored_pink -block:id=carpet,data=5,stdrot=true,allfaces=0:wool_colored_lime -block:id=carpet,data=4,stdrot=true,allfaces=0:wool_colored_yellow -block:id=carpet,data=3,stdrot=true,allfaces=0:wool_colored_light_blue -block:id=carpet,data=2,stdrot=true,allfaces=0:wool_colored_magenta -block:id=carpet,data=1,stdrot=true,allfaces=0:wool_colored_orange -block:id=carpet,data=0,stdrot=true,allfaces=0:wool_colored_white +block:id=black_carpet,stdrot=true,allfaces=0:black_wool +block:id=red_carpet,stdrot=true,allfaces=0:red_wool +block:id=green_carpet,stdrot=true,allfaces=0:green_wool +block:id=brown_carpet,stdrot=true,allfaces=0:brown_wool +block:id=blue_carpet,,stdrot=true,allfaces=0:blue_wool +block:id=purple_carpet,stdrot=true,allfaces=0:purple_wool +block:id=cyan_carpet,stdrot=true,allfaces=0:cyan_wool +block:id=light_gray_carpet,stdrot=true,allfaces=0:light_gray_wool +block:id=gray_carpet,stdrot=true,allfaces=0:gray_wool +block:id=pink_carpet,stdrot=true,allfaces=0:pink_wool +block:id=lime_carpet,,stdrot=true,allfaces=0:lime_wool +block:id=yellow_carpet,stdrot=true,allfaces=0:yellow_wool +block:id=light_blue_carpet,stdrot=true,allfaces=0:light_blue_wool +block:id=magenta_carpet,stdrot=true,allfaces=0:magenta_wool +block:id=orange_carpet,stdrot=true,allfaces=0:orange_wool +block:id=white_carpet,stdrot=true,allfaces=0:white_wool # (172) Hardened clay block:id=hardened_clay,data=*,stdrot=true,allfaces=0:hardened_clay # (173) Coal block diff --git a/bukkit-helper-113/.settings/org.eclipse.core.resources.prefs b/bukkit-helper-113/.settings/org.eclipse.core.resources.prefs index 04cfa2c1..8bc0e1c8 100644 --- a/bukkit-helper-113/.settings/org.eclipse.core.resources.prefs +++ b/bukkit-helper-113/.settings/org.eclipse.core.resources.prefs @@ -1,6 +1,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding//src/test/resources=UTF-8 encoding/=UTF-8