diff --git a/renderdata/bc-models.txt b/renderdata/bc-models.txt index 132c0451..e7801c74 100644 --- a/renderdata/bc-models.txt +++ b/renderdata/bc-models.txt @@ -2,25 +2,18 @@ # define buildcraft-support: true in configuration.txt to enable enabled:buildcraft-support # Variables - can be altered in configuration.txt -var:bc-autoWorkbench=152,bc-builder=157,bc-cobblestonePipe=159,bc-diamondPipe=149,bc-dockingStation=168,bc-drill=151 -var:bc-engine=161,bc-filler=155,bc-frame=160,bc-goldenPipe=148,bc-ironPipe=147,bc-marker=154,bc-miningWell=150 -var:bc-obsidianPipe=156,bc-oilMoving=162,bc-oilStill=163,bc-pipe=166,bc-pump=164,bc-quarry=153,bc-refinery=167 -var:bc-stonePipe=146,bc-tank=165,bc-template=158,bc-woodenPipe=145 +var:bc-autoWorkbench=152,bc-builder=157,bc-dockingStation=168,bc-drill=151 +var:bc-engine=161,bc-filler=155,bc-frame=160,bc-marker=154,bc-miningWell=150 +var:bc-oilMoving=162,bc-oilStill=163,bc-pipe=166,bc-pump=164,bc-quarry=153,bc-refinery=167 +var:bc-tank=165,bc-template=158 # Pipe - set render alg -linkmap:id=bc-woodenPipe,linkalg=5,linkid=bc-stonePipe,linkid=bc-ironPipe,linkid=bc-goldenPipe,linkid=bc-diamondPipe,linkid=bc-obsidianPipe,linkid=bc-cobblestonePipe,linkid=bc-pipe -linkmap:id=bc-stonePipe,linkalg=5,linkid=bc-woodenPipe,linkid=bc-stonePipe,linkid=bc-ironPipe,linkid=bc-goldenPipe,linkid=bc-diamondPipe,linkid=bc-obsidianPipe,linkid=bc-cobblestonePipe,linkid=bc-pipe -linkmap:id=bc-ironPipe,linkalg=5,linkid=bc-woodenPipe,linkid=bc-stonePipe,linkid=bc-ironPipe,linkid=bc-goldenPipe,linkid=bc-diamondPipe,linkid=bc-obsidianPipe,linkid=bc-cobblestonePipe,linkid=bc-pipe -linkmap:id=bc-goldenPipe,linkalg=5,linkid=bc-woodenPipe,linkid=bc-stonePipe,linkid=bc-ironPipe,linkid=bc-diamondPipe,linkid=bc-obsidianPipe,linkid=bc-cobblestonePipe,linkid=bc-pipe -linkmap:id=bc-diamondPipe,linkalg=5,linkid=bc-woodenPipe,linkid=bc-stonePipe,linkid=bc-ironPipe,linkid=bc-goldenPipe,linkid=bc-diamondPipe,linkid=bc-obsidianPipe,linkid=bc-cobblestonePipe,linkid=bc-pipe -linkmap:id=bc-obsidianPipe,linkalg=5,linkid=bc-woodenPipe,linkid=bc-stonePipe,linkid=bc-ironPipe,linkid=bc-goldenPipe,linkid=bc-diamondPipe,linkid=bc-cobblestonePipe,linkid=bc-pipe -linkmap:id=bc-cobblestonePipe,linkalg=5,linkid=bc-woodenPipe,linkid=bc-stonePipe,linkid=bc-ironPipe,linkid=bc-goldenPipe,linkid=bc-diamondPipe,linkid=bc-obsidianPipe,linkid=bc-cobblestonePipe,linkid=bc-pipe -linkmap:id=bc-pipe,linkalg=5,linkid=bc-woodenPipe,linkid=bc-stonePipe,linkid=bc-ironPipe,linkid=bc-goldenPipe,linkid=bc-diamondPipe,linkid=bc-obsidianPipe,linkid=bc-cobblestonePipe,linkid=bc-pipe +linkmap:id=bc-pipe,linkalg=5,linkid=bc-pipe # Frame linkmap:id=bc-frame,linkalg=5,linkid=bc-frame # Pipe - (data is faked: 1=north,2=east,4=south,8=west) # Pipe - no neighbors # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=0,scale=4 +block:id=bc-pipe,id=bc-frame,data=0,scale=4 layer:1,2 ---- -**- @@ -28,7 +21,7 @@ layer:1,2 ---- # Pipe - just north neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=1,scale=4 +block:id=bc-pipe,id=bc-frame,data=1,scale=4 layer:1,2 -**- -**- @@ -36,19 +29,19 @@ layer:1,2 ---- # Pipe - just east neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=2,scale=4 -rotate:id=bc-woodenPipe,data=1,rot=90 +block:id=bc-pipe,id=bc-frame,data=2,scale=4 +rotate:id=bc-pipe,data=1,rot=90 # Pipe - just south neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=4,scale=4 -rotate:id=bc-woodenPipe,data=1,rot=180 +block:id=bc-pipe,id=bc-frame,data=4,scale=4 +rotate:id=bc-pipe,data=1,rot=180 # Pipe - just south neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=8,scale=4 -rotate:id=bc-woodenPipe,data=1,rot=270 +block:id=bc-pipe,id=bc-frame,data=8,scale=4 +rotate:id=bc-pipe,data=1,rot=270 # Pipe - north and east neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=3,scale=4 +block:id=bc-pipe,id=bc-frame,data=3,scale=4 layer:1,2 -**- -*** @@ -56,19 +49,19 @@ layer:1,2 ---- # Pipe - east and south neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=6,scale=4 -rotate:id=bc-woodenPipe,data=3,rot=90 +block:id=bc-pipe,id=bc-frame,data=6,scale=4 +rotate:id=bc-pipe,data=3,rot=90 # Pipe - south and west neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=12,scale=4 -rotate:id=bc-woodenPipe,data=3,rot=180 +block:id=bc-pipe,id=bc-frame,data=12,scale=4 +rotate:id=bc-pipe,data=3,rot=180 # Pipe - west and north neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=9,scale=4 -rotate:id=bc-woodenPipe,data=3,rot=270 +block:id=bc-pipe,id=bc-frame,data=9,scale=4 +rotate:id=bc-pipe,data=3,rot=270 # Pipe - north and south neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=5,scale=4 +block:id=bc-pipe,id=bc-frame,data=5,scale=4 layer:1,2 -**- -**- @@ -76,11 +69,11 @@ layer:1,2 -**- # Pipe - east and west neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=10,scale=4 -rotate:id=bc-woodenPipe,data=5,rot=90 +block:id=bc-pipe,id=bc-frame,data=10,scale=4 +rotate:id=bc-pipe,data=5,rot=90 # Pipe - north, east and south neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=7,scale=4 +block:id=bc-pipe,id=bc-frame,data=7,scale=4 layer:1,2 -**- -*** @@ -88,19 +81,19 @@ layer:1,2 -**- # Pipe - east, south and west neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=14,scale=4 -rotate:id=bc-woodenPipe,data=7,rot=90 +block:id=bc-pipe,id=bc-frame,data=14,scale=4 +rotate:id=bc-pipe,data=7,rot=90 # Pipe - south, west and north neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=13,scale=4 -rotate:id=bc-woodenPipe,data=7,rot=180 +block:id=bc-pipe,id=bc-frame,data=13,scale=4 +rotate:id=bc-pipe,data=7,rot=180 # Pipe - west, north and east neighbor # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=11,scale=4 -rotate:id=bc-woodenPipe,data=7,rot=270 +block:id=bc-pipe,id=bc-frame,data=11,scale=4 +rotate:id=bc-pipe,data=7,rot=270 # Pipe - north, south, east, west neightbors # Frame -block:id=bc-woodenPipe,id=bc-stonePipe,id=bc-ironPipe,id=bc-goldenPipe,id=bc-diamondPipe,id=bc-obsidianPipe,id=bc-cobblestonePipe,id=bc-pipe,id=bc-frame,data=15,scale=4 +block:id=bc-pipe,id=bc-frame,data=15,scale=4 layer:1,2 -**- **** diff --git a/renderdata/bc-texture.txt b/renderdata/bc-texture.txt index cb5f7f1d..599a5d75 100644 --- a/renderdata/bc-texture.txt +++ b/renderdata/bc-texture.txt @@ -2,25 +2,15 @@ # define buildcraft-support: true in configuration.txt to enable enabled:buildcraft-support # Variables - can be altered in configuration.txt -var:bc-autoWorkbench=152,bc-builder=157,bc-cobblestonePipe=159,bc-diamondPipe=149,bc-dockingStation=168,bc-drill=151 -var:bc-engine=161,bc-filler=155,bc-frame=160,bc-goldenPipe=148,bc-ironPipe=147,bc-marker=154,bc-miningWell=150 -var:bc-obsidianPipe=156,bc-oilMoving=162,bc-oilStill=163,bc-pipe=166,bc-pump=164,bc-quarry=153,bc-refinery=167 -var:bc-stonePipe=146,bc-tank=165,bc-template=158,bc-woodenPipe=145 +var:bc-autoWorkbench=152,bc-builder=157,bc-cobblestonePipe=159,bc-dockingStation=168,bc-drill=151 +var:bc-engine=161,bc-filler=155,bc-frame=160,bc-marker=154,bc-miningWell=150 +var:bc-oilMoving=162,bc-oilStill=163,bc-pipe=166,bc-pump=164,bc-quarry=153,bc-refinery=167 +var:bc-tank=165,bc-template=158 # Files texturefile:id=blk,filename=buildcraft/block_textures.png,xcount=16,ycount=16 texturefile:id=wood,filename=buildcraft/base_wood.png,xcount=4,ycount=2 texturefile:id=iron,filename=buildcraft/base_iron.png,xcount=4,ycount=2 texturefile:id=stone,filename=buildcraft/base_stone.png,xcount=4,ycount=2 -# WOODEN_PIPE_ID = 145 -block:id=bc-woodenPipe,data=*,allfaces=16,txtid=blk,transparency=TRANSPARENT -# STONE_PIPE_ID = 146 -block:id=bc-stonePipe,data=*,allfaces=29,txtid=blk,transparency=TRANSPARENT -# IRON_PIPE_ID = 147 -block:id=bc-ironPipe,data=*,allfaces=19,txtid=blk,transparency=TRANSPARENT -# GOLDEN_PIPE_ID = 148 -block:id=bc-goldenPipe,data=*,allfaces=20,txtid=blk,transparency=TRANSPARENT -# DIAMOND_PIPE_ID = 149 -block:id=bc-diamondPipe,data=*,allfaces=21,txtid=blk,transparency=TRANSPARENT # MINING_WELL_ID = 150 block:id=bc-miningWell,data=2,east=35,top=4036,north=37,south=37,west=38,bottom=38,txtid=blk block:id=bc-miningWell,data=3,west=35,top=4036,north=37,south=37,east=38,bottom=38,txtid=blk @@ -39,8 +29,6 @@ block:id=bc-quarry,data=5,south=39,top=4040,east=38,west=38,north=38,bottom=38,t block:id=bc-marker,data=*,allsides=57,txtid=blk,transparency=TRANSPARENT # FILLER_ID = 155 block:id=bc-filler,data=*,allsides=66,topbottom=4065,txtid=blk -# OBSIDIAN_PIPE_ID = 156 -block:id=bc-obsidianPipe,data=*,allfaces=28,txtid=blk,transparency=TRANSPARENT # BUILDER_ID = 157 block:id=bc-builder,data=2,east=55,top=4054,north=3,south=3,west=3,bottom=3,txtid=blk block:id=bc-builder,data=3,west=55,top=4054,north=3,south=3,east=3,bottom=3,txtid=blk @@ -51,8 +39,6 @@ block:id=bc-template,data=2,east=52,top=4050,north=48,south=48,west=48,bottom=48 block:id=bc-template,data=3,west=52,top=4050,north=48,south=48,east=48,bottom=48,txtid=blk block:id=bc-template,data=4,north=52,top=4050,east=48,west=48,south=48,bottom=48,txtid=blk block:id=bc-template,data=5,south=52,top=4050,east=48,west=48,north=48,bottom=48,txtid=blk -# COBBLESTONE_PIPE_ID = 159 -block:id=bc-cobblestonePipe,data=*,allfaces=17,txtid=blk,transparency=TRANSPARENT # FRAME_ID = 160 block:id=bc-frame,data=*,allfaces=34,txtid=blk,transparency=TRANSPARENT # ENGINE_ID = 161 diff --git a/renderdata/rp2-models.txt b/renderdata/rp2-models.txt index adf2421f..230b4a60 100644 --- a/renderdata/rp2-models.txt +++ b/renderdata/rp2-models.txt @@ -48,9 +48,102 @@ layer:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ---*--------*--- ---*--------*--- # Logic -block:id=rp2-logic-logic,data=*,scale=4 +block:id=rp2-logic-logic,data=*,scale=8 layer:0 -**** -**** -**** -**** +******** +******** +******** +******** +******** +******** +******** +******** +# Array (array.array.id,0) +# Inv-Array (array.array.id,1) +# Non-Inv-Array (array.array.id,2) +block:id=rp2-array-array,data=0,data=1,data=2,scale=16 +layer:0,1 +**************** +**************** +**************** +**************** +**************** +**************** +**************** +**************** +**************** +**************** +**************** +**************** +**************** +**************** +**************** +**************** +layer:2,3 +-------**------- +-------**------- +--*----**----*-- +-------**------- +-------**------- +-------**------- +-------**------- +**-----**-----** +**-----**-----** +-------**------- +-------**------- +-------**------- +-------**------- +--*----**----*-- +-------**------- +-------**------- +layer:4,5,6,7,8,9 +---------------- +---------------- +--*----------*-- +---------------- +---------------- +---------------- +---------------- +**------------** +**------------** +---------------- +---------------- +---------------- +---------------- +--*----------*-- +---------------- +---------------- +layer:10 +---------------- +---------------- +--*----------*-- +--*----------*-- +--*----------*-- +--*----------*-- +--*----------*-- +***----------*** +***----------*** +--*----------*-- +--*----------*-- +--*----------*-- +--*----------*-- +--*----------*-- +---------------- +---------------- +layer:11,12 +---------------- +---------------- +---------------- +---------------- +---------------- +---------------- +---------------- +**************** +**************** +---------------- +---------------- +---------------- +---------------- +---------------- +---------------- +---------------- diff --git a/renderdata/rp2-texture.txt b/renderdata/rp2-texture.txt index 8af7b255..16a21963 100644 --- a/renderdata/rp2-texture.txt +++ b/renderdata/rp2-texture.txt @@ -15,6 +15,7 @@ texturefile:id=world,filename=redpower2/world1.png,xcount=16,ycount=16 texturefile:id=worlditem,filename=redpower2/worlditems1.png,xcount=16,ycount=16 texturefile:id=logic,filename=redpower2/logic1.png,xcount=16,ycount=16 texturefile:id=lighting,filename=redpower2/lighting1.png,xcount=16,ycount=16 +texturefile:id=array,filename=redpower2/array1.png,xcount=16,ycount=16 ############ # Blocks from RedPower2Core ############ @@ -179,3 +180,12 @@ block:id=rp2-lighting-lampOff,data=13,allfaces=29,txtid=lighting block:id=rp2-lighting-lampOff,data=14,allfaces=30,txtid=lighting # Black Lamp off block:id=rp2-lighting-lampOff,data=15,allfaces=31,txtid=lighting +############ +# Blocks from RedPower2Array +############ +#Array (array.array.id,0) +block:id=rp2-array-array,data=0,allsides=0,top=2,bottom=0,txtid=array,transparency=TRANSPARENT +# Inv-Array (array.array.id,1) +block:id=rp2-array-array,data=1,allsides=0,top=3,bottom=0,txtid=array,transparency=TRANSPARENT +# Non-Inv-Array (array.array.id,2) +block:id=rp2-array-array,data=2,allsides=0,top=5,bottom=0,txtid=array,transparency=TRANSPARENT diff --git a/texturepacks/standard/redpower2/array1.png b/texturepacks/standard/redpower2/array1.png new file mode 100644 index 00000000..5f1781d9 Binary files /dev/null and b/texturepacks/standard/redpower2/array1.png differ