From b2535bf46910dda415dc06e64cdddf64242af9f2 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Mon, 2 Jan 2012 01:08:29 -0600 Subject: [PATCH] Add RedPower2Array, drop obsolete (conflicting) BuildCraft pipe IDs --- renderdata/bc-models.txt | 69 +++++++------- renderdata/bc-texture.txt | 22 +---- renderdata/rp2-models.txt | 103 ++++++++++++++++++++- renderdata/rp2-texture.txt | 10 ++ texturepacks/standard/redpower2/array1.png | Bin 0 -> 5399 bytes 5 files changed, 143 insertions(+), 61 deletions(-) create mode 100644 texturepacks/standard/redpower2/array1.png 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 0000000000000000000000000000000000000000..5f1781d99e630c6f7ba6a5e24c6ae6b5ae892075 GIT binary patch literal 5399 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 literal 0 HcmV?d00001