Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Start work on new water model - shift over to using basic version

Browse source
This commit is contained in:
Mike Primm 2018-09-01 16:55:00 -05:00
parent 88816b176e
commit 6da97c5e3f
20 changed files with 325 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

24
DynmapCore/src/main/resources/models_0.txt
View file

@ -763,27 +763,9 @@ layer:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
----------------
# Lily pad
patchblock:id=waterlily,data=*,patch0=HorizY001ZTop
# Water (1 down)
# Lava (1 down)
boxblock:id=flowing_water,id=water,id=flowing_lava,id=lava,data=1,ymax=0.875
# Water (2 down)
# Lava (2 down)
boxblock:id=flowing_water,id=water,id=flowing_lava,id=lava,data=2,ymax=0.75
# Water (3 down)
# Lava (3 down)
boxblock:id=flowing_water,id=water,id=flowing_lava,id=lava,data=3,ymax=0.625
# Water (4 down)
# Lava (4 down)
boxblock:id=flowing_water,id=water,id=flowing_lava,id=lava,data=4,ymax=0.5
# Water (5 down)
# Lava (5 down)
boxblock:id=flowing_water,id=water,id=flowing_lava,id=lava,data=5,ymax=0.375
# Water (6 down)
# Lava (6 down)
boxblock:id=flowing_water,id=water,id=flowing_lava,id=lava,data=6,ymax=0.25
# Water (7 down)
# Lava (7 down)
boxblock:id=flowing_water,id=water,id=flowing_lava,id=lava,data=7,ymax=0.125
# Water
# Lava
customblock:id=flowing_water,id=water,id=flowing_lava,id=lava,class=org.dynmap.hdmap.renderer.FluidStateRenderer
# Enchantment Table
boxblock:id=enchanting_table,data=*,ymax=0.75

24
DynmapCore/src/main/resources/models_1.txt
View file

@ -804,27 +804,9 @@ layer:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
----------------
# Lily pad
patchblock:id=lily_pad,patch0=HorizY001ZTop
# Water (1 down)
# Lava (1 down)
boxblock:id=water,id=lava,data=1,ymax=0.875
# Water (2 down)
# Lava (2 down)
boxblock:id=water,id=lava,data=2,ymax=0.75
# Water (3 down)
# Lava (3 down)
boxblock:id=water,id=lava,data=3,ymax=0.625
# Water (4 down)
# Lava (4 down)
boxblock:id=water,id=lava,data=4,ymax=0.5
# Water (5 down)
# Lava (5 down)
boxblock:id=water,id=lava,data=5,ymax=0.375
# Water (6 down)
# Lava (6 down)
boxblock:id=water,id=lava,data=6,ymax=0.25
# Water (7 down)
# Lava (7 down)
boxblock:id=water,id=lava,data=7,ymax=0.125
# Water
customblock:id=water,id=lava,class=org.dynmap.hdmap.renderer.FluidStateRenderer
# Enchantment Table
boxblock:id=enchanting_table,ymax=0.75

7
DynmapCore/src/main/resources/texture_0.txt
View file

@ -390,14 +390,11 @@ block:id=sapling,data=3,data=11,patch0-1=0:sapling_jungle,transparency=TRANSPARE
# Bedrock
block:id=bedrock,allfaces=0:bedrock,stdrot=true
# Water
block:id=flowing_water,allfaces=12000:water_flow,stdrot=true,transparency=SEMITRANSPARENT
# Stationary water
block:id=water,data=0,data=8,data=9,data=10,data=11,data=12,data=13,data=14,data=15,topbottom=12000:water_still,allsides=12000:water_flow,stdrot=true,transparency=SEMITRANSPARENT
block:id=water,data=1,data=2,data=3,data=4,data=5,data=6,data=7,allfaces=12000:water_flow,stdrot=true,transparency=SEMITRANSPARENT
block:id=water,id=flowing_water,patch0=12000:water_still,patch1=12000:water_flow,transparency=SEMITRANSPARENT
# Lava
block:id=flowing_lava,allfaces=0:lava_flow,stdrot=true,transparency=SEMITRANSPARENT
# Stationary Lava
block:id=lava,allfaces=0:lava_still,stdrot=true,transparency=SEMITRANSPARENT
block:id=lava,id=flowing_lava,patch0=0:lava_still,patch1=0:lava_flow,transparency=SEMITRANSPARENT
# Sand
block:id=sand,allfaces=0:sand,stdrot=true
[1.7.0-]block:id=sand,data=1,allfaces=0:red_sand,stdrot=true

9
DynmapCore/src/main/resources/texture_1.txt
View file

@ -133,10 +133,7 @@ texture:id=birch_sapling
texture:id=jungle_sapling
texture:id=bedrock
texture:id=water_still,material=WATER
#TODO: fix when I figure out 1.13 biome shading logic
#texturefile:id=water_still,filename=assets/minecraft/textures/blocks/water_still.png,xcount=1,ycount=1
texture:id=water_flow,material=WATER
#texturefile:id=water_flow,filename=assets/minecraft/textures/blocks/water_flow.png,xcount=1,ycount=1
texture:id=lava_still
texture:id=lava_flow
texture:id=sand
@ -599,9 +596,11 @@ block:id=dark_oak_sapling,data=1,patch0-1=0:dark_oak_sapling,transparency=TRANSP
# Bedrock
block:id=bedrock,allfaces=0:bedrock,stdrot=true
# Water
block:id=water,topbottom=12000:water_still,allsides=12000:water_flow,stdrot=true,transparency=SEMITRANSPARENT
#block:id=water,topbottom=12000:water_still,allsides=12000:water_flow,stdrot=true,transparency=SEMITRANSPARENT
block:id=water,patch0=12000:water_still,patch1=12000:water_flow,transparency=SEMITRANSPARENT
# Lava
block:id=lava,allfaces=0:lava_still,stdrot=true,transparency=SEMITRANSPARENT
#block:id=lava,allfaces=0:lava_still,stdrot=true,transparency=SEMITRANSPARENT
block:id=lava,patch0=0:lava_still,patch1=0:lava_flow,transparency=SEMITRANSPARENT
# Sand
block:id=sand,allfaces=0:sand,stdrot=true
# Red Sand