diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index a63f1c49..b955297e 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1615,3 +1615,15 @@ patchblock:id=bubble_column [1.14-]patchrotate:id=bell,data=14,roty=270 [1.14-]patchblock:id=bell,data=13 [1.14-]patchrotate:id=bell,data=14,roty=90 + +# 1.15 blocks +# Beenest +[1.15-]boxlist:id=bee_nest,id=beehive,data=0-5,box=0:1:0:1:0:1:0/1/3/3/2/3 +[1.15-]patchblock:id=bee_nest,id=beehive,data=6-11 +[1.15-]patchrotate:id=bee_nest,data=0,roty=180 +[1.15-]patchblock:id=bee_nest,id=beehive,data=12-17 +[1.15-]patchrotate:id=bee_nest,data=0,roty=270 +[1.15-]patchblock:id=bee_nest,id=beehive,data=18-23 +[1.15-]patchrotate:id=bee_nest,data=0,roty=90 +# Honey block +[1.15-]boxlist:id=honey_block,box=0:1:0:1:0:1:1/1/1/1/1/1,box=0.0625:0.9375:0.0625:0.9375:0.0625:0.9375:0/1/2/2/2/2 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 4fced0b2..ad69ba37 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2404,3 +2404,29 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.14-]block:id=campfire,patch0=0:campfire_log,patch1=0:campfire_log_lit,patch2=0:campfire_fire,transparency=TRANSPARENT # Bell [1.14-]block:id=bell,patch0=0:dark_oak_planks,patch1=0:stone,patch2=0:bell_top,patch3=0:bell_bottom,patch4=0:bell_side,transparency=TRANSPARENT + +# 1.15 resources +[1.15-]texture:id=bee_nest_bottom +[1.15-]texture:id=bee_nest_top +[1.15-]texture:id=bee_nest_front +[1.15-]texture:id=bee_nest_front_honey +[1.15-]texture:id=bee_nest_side +[1.15-]texture:id=beehive_end +[1.15-]texture:id=beehive_front +[1.15-]texture:id=beehive_front_honey +[1.15-]texture:id=beehive_side +[1.15-]texture:id=honey_block_top +[1.15-]texture:id=honey_block_bottom +[1.15-]texture:id=honey_block_side +[1.15-]texture:id=honeycomb_block + +# Beenest (facing N, S, W, E) +[1.15-]block:id=bee_nest,data=0-4,data=6-10,data=12-16,data=18-22,patch0=0:bee_nest_top,patch1=0:bee_nest_bottom,patch2=0:bee_nest_front,patch3=0:bee_nest_side +[1.15-]block:id=bee_nest,data=5,data=11,data=17,data=23,patch0=0:bee_nest_top,patch1=0:bee_nest_bottom,patch2=0:bee_nest_front_honey,patch3=0:bee_nest_side +# Beehive (facing N, S, W, E) +[1.15-]block:id=beehive,data=0-4,data=6-10,data=12-16,data=18-22,patch0=0:beehive_end,patch1=0:beehive_end,patch2=0:beehive_front,patch3=0:beehive_side +[1.15-]block:id=beehive,data=5,data=11,data=17,data=23,patch0=0:beehive_end,patch1=0:beehive_end,patch2=0:beehive_front_honey,patch3=0:beehive_side +# Honey block +[1.15-]block:id=honey_block,patch0=0:honey_block_top,patch1=0:honey_block_bottom,patch2=0:honey_block_side,transparency=TRANSPARENT +# Honeycomb block +[1.15-]block:id=honeycomb_block,allfaces=0:honeycomb_block,stdrot=true diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_bottom.png new file mode 100644 index 00000000..9285e6bf Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_bottom.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front.png new file mode 100644 index 00000000..026551a2 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front_honey.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front_honey.png new file mode 100644 index 00000000..06fac14c Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front_honey.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_side.png new file mode 100644 index 00000000..c604de79 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_side.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_top.png new file mode 100644 index 00000000..75aff103 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_top.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_end.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_end.png new file mode 100644 index 00000000..6bdf368b Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_end.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front.png new file mode 100644 index 00000000..3679deb4 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front_honey.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front_honey.png new file mode 100644 index 00000000..453f6d25 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front_honey.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_side.png new file mode 100644 index 00000000..2fcf0643 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_side.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_bottom.png new file mode 100644 index 00000000..cc13bc5b Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_bottom.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_side.png new file mode 100644 index 00000000..071ca42e Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_side.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_top.png new file mode 100644 index 00000000..7deb75dc Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_top.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honeycomb_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honeycomb_block.png new file mode 100644 index 00000000..d19f7a01 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honeycomb_block.png differ