From 811ed70ef6fa9f3ceed6f3b1b48300e2fa806014 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 10 Nov 2015 23:55:26 +0000 Subject: [PATCH] Added the Solegnolia Petite. --- .../vazkii/botania/common/block/ModBlocks.java | 2 +- .../subtile/functional/SubTileSolegnolia.java | 16 +++++++++++++--- .../resources/assets/botania/lang/en_US.lang | 2 ++ .../textures/blocks/alt/solegnoliaChibi.png | Bin 0 -> 16679 bytes 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/solegnoliaChibi.png diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 04f9d5d70..2f4c5c190 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -508,7 +508,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MEDUMONE, SubTileMedumone.class); registerSubTileWithMini(LibBlockNames.SUBTILE_MARIMORPHOSIS, SubTileMarimorphosis.class); registerSubTileWithMini(LibBlockNames.SUBTILE_BUBBELL, SubTileBubbell.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SOLEGNOLIA, SubTileSolegnolia.class); + registerSubTileWithMini(LibBlockNames.SUBTILE_SOLEGNOLIA, SubTileSolegnolia.class); } public static void registerMultiparts() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index f5eeacd5e..1840e111b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -23,7 +23,8 @@ import vazkii.botania.common.lexicon.LexiconData; public class SubTileSolegnolia extends SubTileFunctional { - private static final int RANGE = 5; + private static final double RANGE = 5; + private static final double RANGE_MINI = 1; public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap()); private static boolean registered = false; @@ -52,7 +53,8 @@ public class SubTileSolegnolia extends SubTileFunctional { if(flower.mana == 0 || flower.redstoneSignal > 0 || flower.supertile.getWorldObj() != e.worldObj || flower.supertile.getWorldObj().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile) continue; - if(MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, flower.supertile.xCoord + 0.5, flower.supertile.yCoord + 0.5, flower.supertile.zCoord + 0.5) <= RANGE) + double range = flower.getRange(); + if(MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, flower.supertile.xCoord + 0.5, flower.supertile.yCoord + 0.5, flower.supertile.zCoord + 0.5) <= range) return true; } @@ -69,14 +71,22 @@ public class SubTileSolegnolia extends SubTileFunctional { return 0xC99C4D; } + public double getRange() { + return RANGE; + } + @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Circle(toChunkCoordinates(), getRange()); } @Override public LexiconEntry getEntry() { return LexiconData.solegnolia; } + + public static class Mini extends SubTileSolegnolia { + @Override public double getRange() { return RANGE_MINI; } + } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 2c185bab7..2e9f68e96 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1281,6 +1281,8 @@ tile.botania:flower.bubbellChibi.name=Bubbell Petite tile.botania:flower.bubbellChibi.reference=And whistle tile.botania:flower.solegnolia.name=Solegnolia tile.botania:flower.solegnolia.reference=All your magnets are belong to us +tile.botania:flower.solegnoliaChibi.name=Solegnolia Petite +tile.botania:flower.solegnoliaChibi.reference=All your magnets are belong to us # ITEM NAMES item.botania:lexicon.name=Lexica Botania diff --git a/src/main/resources/assets/botania/textures/blocks/alt/solegnoliaChibi.png b/src/main/resources/assets/botania/textures/blocks/alt/solegnoliaChibi.png new file mode 100644 index 0000000000000000000000000000000000000000..fb752ce09d909354a6aca0eeab13517af31c88da GIT binary patch literal 16679 zcmeI3U5MO79KdJGVcUb<M|0^wKSYwPurSvU``Xx8-`cTu*ux!Df@$yU^Xu zc9Xl^JNlqj5Pc9W2v+gA`k=*+w+g=07oP;Ff*%y0N=va~DMgCLnPhi1o9tePwulcC zE|>q#{J-Y+pZqs@*f$Q(JiBT5(P039pSSf7N8*3@bP9$B54GgeO+s+ruEAI`Njn!y95+;zre!lu=YkdWK7jk}OD~kXCs~(v(q6%5v=^nIA?{ zu3?t7*}}ngIP_^ex#+reO%R&RW~wQt?8bs1sj4c7X(65Fkp}Oq)LgyA*PPvfla8MP zbc}{ocP+cdVZVCGUUJ8iNgRkA?R8b_Bv8$1vqKbxmR=X6lqmEwG7Vx=UusnR)J#Kw z62R9vB$aq*x@e`{rA%_6_a02bK|nHqyS9&fH2J3bW9$ zml_5aN|Gv+YVg*ky-1 z2)W5g?x~|z&9s}&o}3WX?v}di2o`h~=FwKn@S?;^**Q_tGO{L%FNEv^rHFaaHm&kX z*IYv8;+&M#(y}Iwwar6HQFC;|n7XUq%|Tc#;}pR=H;BwZ@8~j!8Vrg7M`dX&_UpxP(e^x{F`*YzR)|`nW$KKRE3mjnVK}F z%4#|*^JYddcoQmFeoT?eyrHPFu9&6{(}P2^#)}>NW2!v+cSQz3rNwTaa1EJm&gP!$Q4YuY`0uH0eqc zgy`cY7HZ1E8)c=pivC790#Ejib~lROmFs%LfwiwUs} zn!19!a$3|R^r!Ac-CYzruKwc+bkj2y_1Xe7^Fk++&OmfU|L3C7wY+<}V`5*Wp{hm^ zb*c95|Fs_tXzrM<=T3RtYD>=W)BN zEcyCsRzwGSv_?nUG&~(OJ+`)Kcsgp@wS2y2x%qTET4Xq6g&*sJ=a3`l4Fu-1nT(vt z3DM!G#bK)jEAs^lJ%>2B;Y-=JO?0BK;jux6p^3I(P^!?og8yw5jG{LY^b#bHx1iV; z8QL%p{^+jg!TTm2SrCGPMqs#TC=nfoi=dzp7%m!0M2F!bC};$Ri-r=>VYmni8iC=W zp+s~TE`owaV7O=~5gmq$pr8>LE*eTihv6b9Xat6fh7!?XxCjawf#IT|M06M~f`Ue1 zxM(O59fpgbpb;1@8cIZm;UXw#1cr--647C}2nrg3;i92LbQmszf<|DtXebdKhKrz} z5g0BSN<@d@A}DAChKq(0(P6j<3L1goqM<}|7%qZ>Mqs#TC=nfoi=dzp7%m!0M2F!b zC};$Ri-r=>VYmni8evUb!`s0`jL;$WG2S9rdfF1Ukm%cd&zz{cGn3!uNz?PvKcM_h5RPWNN)5O;v#?LG8X;@t9xm$^6rKHm8W`0BM?-p$({xcY||^AOA6&nw^i5w~q# z2fny`1)N=f8(hBj57@PRUBW*5Ta;lu1DraJxVrHU_4S8Tsb(@FJ=zQmMYzf%!)3xp1`mI9=eBH2h2>fv7T0&TTBwj+KixTs^U(bE{ UW9ISK_h94c12ctB_aA@tUn*&pZ2$lO literal 0 HcmV?d00001