From b2dfb35a72e5b099c81d743241cb6896a18f139f Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Fri, 7 Mar 2014 01:17:14 -0400 Subject: [PATCH] Rotation Fixes and Schematic Changes Fixed rotations for hopper and droppers. Hoppers were failing because powered hoppers have different metadata. Droppers were just missing from the list of oriented blocks. Fixed the wooden buttons on Cerevisiae's altar room and added her puzzle room once hoppers were working reliably. --- .../mod_pocketDim/schematic/BlockRotator.java | 38 ++++++++++++++++-- ...omplexHall_Cere-PuzzleWall_Open.schematic} | Bin ...dEnd_Cere-FloatingAltar_Open_100.schematic | Bin 0 -> 1612 bytes 3 files changed, 34 insertions(+), 4 deletions(-) rename src/main/resources/schematics/ruins/{ComplexHall_CerePuzzleWall_Open_100.schematic => ComplexHall_Cere-PuzzleWall_Open.schematic} (100%) create mode 100644 src/main/resources/schematics/ruins/DeadEnd_Cere-FloatingAltar_Open_100.schematic diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/schematic/BlockRotator.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/BlockRotator.java index bbf1251..af0050e 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/schematic/BlockRotator.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/BlockRotator.java @@ -22,6 +22,7 @@ public class BlockRotator static { hasOrientations[Block.dispenser.blockID] = true; + hasOrientations[Block.dropper.blockID] = true; hasOrientations[Block.stairsStoneBrick.blockID] = true; hasOrientations[Block.lever.blockID] = true; hasOrientations[Block.stoneButton.blockID] = true; @@ -241,7 +242,7 @@ public class BlockRotator break; } } - else if (blockID == Block.chest.blockID || blockID == Block.chestTrapped.blockID || blockID == Block.ladder.blockID || blockID == Block.hopperBlock.blockID|| blockID == Block.furnaceBurning.blockID|| blockID == Block.furnaceIdle.blockID) + else if (blockID == Block.chest.blockID || blockID == Block.chestTrapped.blockID || blockID == Block.ladder.blockID || blockID == Block.furnaceBurning.blockID|| blockID == Block.furnaceIdle.blockID) { switch (metadata) { @@ -258,7 +259,36 @@ public class BlockRotator metadata = 3; break; } - + } + else if (blockID == Block.hopperBlock.blockID) + { + switch (metadata) + { + case 2: + metadata = 5; + break; + case 3: + metadata = 4; + break; + case 4: + metadata = 2; + break; + case 5: + metadata = 3; + break; + case 10: + metadata = 13; + break; + case 11: + metadata = 12; + break; + case 12: + metadata = 10; + break; + case 13: + metadata = 11; + break; + } } else if (blockID==Block.vine.blockID) { @@ -352,7 +382,7 @@ public class BlockRotator break; } } - else if(blockID== Block.lever.blockID||blockID== Block.stoneButton.blockID||blockID== Block.stoneButton.blockID||blockID== Block.woodenButton.blockID||blockID== Block.torchWood.blockID||blockID== Block.torchRedstoneIdle.blockID||blockID== Block.torchRedstoneActive.blockID) + else if(blockID== Block.lever.blockID || blockID == Block.stoneButton.blockID || blockID == Block.woodenButton.blockID || blockID== Block.torchWood.blockID||blockID== Block.torchRedstoneIdle.blockID||blockID== Block.torchRedstoneActive.blockID) { switch (metadata) { @@ -382,7 +412,7 @@ public class BlockRotator break; } } - else if(blockID== Block.pistonBase.blockID||blockID==Block.pistonExtension.blockID||blockID==Block.pistonStickyBase.blockID||blockID==Block.dispenser.blockID||blockID==Block.dropper.blockID) + else if(blockID== Block.pistonBase.blockID||blockID==Block.pistonExtension.blockID||blockID==Block.pistonStickyBase.blockID || blockID == Block.dispenser.blockID || blockID == Block.dropper.blockID) { switch (metadata) { diff --git a/src/main/resources/schematics/ruins/ComplexHall_CerePuzzleWall_Open_100.schematic b/src/main/resources/schematics/ruins/ComplexHall_Cere-PuzzleWall_Open.schematic similarity index 100% rename from src/main/resources/schematics/ruins/ComplexHall_CerePuzzleWall_Open_100.schematic rename to src/main/resources/schematics/ruins/ComplexHall_Cere-PuzzleWall_Open.schematic diff --git a/src/main/resources/schematics/ruins/DeadEnd_Cere-FloatingAltar_Open_100.schematic b/src/main/resources/schematics/ruins/DeadEnd_Cere-FloatingAltar_Open_100.schematic new file mode 100644 index 0000000000000000000000000000000000000000..3e9d65485337b42cc4cbef17feca6ec5f52dfbd4 GIT binary patch literal 1612 zcmV-S2DAAeiwFP!000000PUR1Zrer_hDVYmO3n=}y6qwcx-wCq=tAf+jguCrixy~s ztYSd22#bg%5f%$3-KP7zN;X7arH@nUW^+d5FN-2MWAgt5n52K6xt=*34k;ar-XE7^ zXEN~JOG_M`4g7%+m!Ab8gb)q1k@%G24)IxL%O^;DjKoJsgtUP66crbWknG7aPjWCF z-31_okYccO7l7mnnvJ)2sDxCEuI>U5g|4#Q0^DM@u-pTNz37u}nr;d2co946sTDIz zRSpded7`_>BY5dOV1fp`S_>sQUG4lEIdwx))uz!g9EwKEa4Ug5>ZNq^x?b5=ehUIF ze;37ZA*q(=bcXtOdtHEiu@d&~PfMDkbwKb}n?|<0Z{D4Ry;v%p70I2DwT1FR%Wx|K zrRk-5J>&>qG&(K-B|6=9Rwc~@o61&Vj;D7Vi2PLkp4k(Gi& zoRHld_qvVLu>uzY;cYaWW@i7c1EkqHYQs0N;av?}3xZF{;gcdAO-KkKgb+dqA%qY@ z2qAIn(jz^ar^%dXYS-|HoIwvC*#5VCucf!M!yf-8_^PvW;d=g^#{H?n=W!_ z2rD|})qB^EcE5DzXMatvoZ0l{c;HUY-RZmNzmI30GyU!6<@IdtjG`nOe@AxTMB5M1 z_9)uE7mHVOH5Q_MTZpFUoIBGie=KZE^j?fcKVHu+-_3>i?!SXOM}CpotBDv$hkL_lhSUT2@s>sgFFl6)ed&DH`Jo(Bi`~M-VdJK54o+p1p$=H5E}V~EIJ`}XvyLM4;BK&i{pnu zp#ND1z0U*!DJ&Hgg$#&&ytooV2qAc$cVRv&7mneKRfQ# z*cV?lMf;6A^2g$9OLR8h{J8wAyM#i76l)`fVY(WIK&5D+2>X*Pfy1E>)bN7h4iPq= z4iOEN{x9jK;al-Gqc{}9B9djEJMv`gTarDzVbiR6QY=oy9*<%lN*IeFNH_d8`ed_Y zo`>XFpV+4(ycx#nf;4HkAW2?JiSkN{c2@G1c)PEPacxUQ;^}ZLhHEjdZVbcoaNBe( zM%qf<%Q8LB>{Y=ngxePOih%vONjpWNxK`8J&P*8I^kCa|iZZnA$ibpNiQ0PXCaL!A z$WBNai7V}SvTCoi=jmdaW%dH$dcqc3CY{>0IZ<%(M)R+RJSRwd167nPn!<(xFY};u zi{T)rOB*T$WOWEbWh-l|V%dqRt!%e=4YEBwNxx>lJ{g|GY?btpCCC$%7S|KCP+k-? z+_bYty_AkwYdT^d8jJS#P=)E@*<052@9Y!55}nRW{~oRqpP*5nIPND2dwXOnB{@;t zM$(j~*|NMBu(ZRE|E&0!*b1P9@}j8WrW?6*a?{K8Qo9*hRuDKT?8CsAIrf$4bbDrH zC+_CXMA=H(MBT|Ht0kY}2e$0`pN27Y(KN_1kAlH^q82IuvxC_|R5ili53cvcF>@vu zW9MycrqmKO$@PEO!!i%@t>;dR?{`uF4{N=zXzF|&gqO1O3SQ`9)VbelOs4g|<-6Z$ zfiXnMn)c?}j@Q@=%-1lnpygXa9vmSE3SqzBzero}iv|(0)bPE73lQEGRq3Z%qY!^! zp^Ou&xQ0PU-k`u}+>D0vzQaXA2qAN1-$PrRC;JCJJJ1rzEf1W9l6SehDl8VIe?#l_=YIZSufp9%>3ke2BlFI); K4w_fa`Tzh)O%OK# literal 0 HcmV?d00001