From a74b2da532b31b94b7c6c9bf17f2448255e4b6a0 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sat, 25 Apr 2015 00:50:15 -0700 Subject: [PATCH] Removing defunct TC research.xml Adding Thermal Foundation fluids to capsules. --- gradle.properties | 2 +- .../java/magicbees/item/types/FluidType.java | 9 ++ .../assets/magicbees/lang/en_US.lang | 7 ++ .../assets/magicbees/research/research.xml | 103 ------------------ .../textures/items/liquids/Steam.png | Bin 1306 -> 0 bytes .../magicbees/textures/items/liquids/coal.png | Bin 0 -> 584 bytes .../textures/items/liquids/cryotheum.png | Bin 0 -> 298 bytes .../textures/items/liquids/ender.png | Bin 0 -> 312 bytes .../textures/items/liquids/glowstone.png | Bin 0 -> 366 bytes .../magicbees/textures/items/liquids/mana.png | Bin 0 -> 301 bytes .../textures/items/liquids/pyrotheum.png | Bin 0 -> 366 bytes .../textures/items/liquids/redstone.png | Bin 0 -> 285 bytes .../textures/items/liquids/steam.png | Bin 0 -> 280 bytes 13 files changed, 17 insertions(+), 104 deletions(-) delete mode 100644 src/main/resources/assets/magicbees/research/research.xml delete mode 100644 src/main/resources/assets/magicbees/textures/items/liquids/Steam.png create mode 100644 src/main/resources/assets/magicbees/textures/items/liquids/coal.png create mode 100644 src/main/resources/assets/magicbees/textures/items/liquids/cryotheum.png create mode 100644 src/main/resources/assets/magicbees/textures/items/liquids/ender.png create mode 100644 src/main/resources/assets/magicbees/textures/items/liquids/glowstone.png create mode 100644 src/main/resources/assets/magicbees/textures/items/liquids/mana.png create mode 100644 src/main/resources/assets/magicbees/textures/items/liquids/pyrotheum.png create mode 100644 src/main/resources/assets/magicbees/textures/items/liquids/redstone.png create mode 100644 src/main/resources/assets/magicbees/textures/items/liquids/steam.png diff --git a/gradle.properties b/gradle.properties index f08ded8..8d592c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ version_bloodmagic=1.3.1-7 version_botania=r1.6-180 version_mc=1.7.10 -version_forge=10.13.2.1230 +version_forge=10.13.2.1291 diff --git a/src/main/java/magicbees/item/types/FluidType.java b/src/main/java/magicbees/item/types/FluidType.java index fd9ec76..d86285c 100644 --- a/src/main/java/magicbees/item/types/FluidType.java +++ b/src/main/java/magicbees/item/types/FluidType.java @@ -38,6 +38,15 @@ public enum FluidType // Railcraft CREOSOTEOIL("creosote"), STEAM("steam"), + + // Thermal Foundation + REDSTONE("redstone"), + GLOWSTONE("glowstone"), + ENDER("ender"), + PYROTHEUM("pyrotheum"), + CRYOTHEUM("cryotheum"), + MANA("mana"), + COAL("coal"), ; public String liquidID; public int iconIdx; diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index 266d15b..0213ac5 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -156,6 +156,13 @@ liquid.liquidnitrogen=Liquid Nitrogen liquid.liquiddna=Liquid DNA liquid.creosote=Creosote Oil liquid.steam=Steam +liquid.redstone=Destabilized Redstone +liquid.glowstone=Energized Glowstone +liquid.ender=Resonant Ender +liquid.pyrotheum=Blazing Pyrotheum +liquid.cryotheum=Gelid Cryotheum +liquid.mana=Primal Mana +liquid.coal=Liquifacted Coal #Moondial moon.full=Full Moon diff --git a/src/main/resources/assets/magicbees/research/research.xml b/src/main/resources/assets/magicbees/research/research.xml deleted file mode 100644 index 5966495..0000000 --- a/src/main/resources/assets/magicbees/research/research.xml +++ /dev/null @@ -1,103 +0,0 @@ - - -Bees And Magic -Across Fields and Forest -There is something about your world that makes you think trees and bees require more research. -A recent breakthrough has given you information regarding Apiculture and Arborculture. Perhaps it isn't quite as mundane as it first seemed. - -The potential exists for further study. All that is required is some creative thinking to apply new uses to old, familiar items. - - - -Concentrated Compound -An Apatite for more... -You believe you can extend your reserves of apatite by enriching the crafted material with something that crops may appreciate. -You have discovered a method to stretch your reserves of apatite to the limit through the use of magic. By infusing the mixture created by crushing the apatite crystals with dirt with the aspect of the Harvest, you can create additional reserves of it. This mixture is then diluted with sand to produce the normal variety of fertilizer. -FERTILIZER - - - -Magic Frame -A Different Frame of Bee -Continuing from your curiousity into these flying creatures, an idea has ocurred to you how to encourage them to work faster, coaxed along by the judicious use of magic applied to some existing beekeeping equipment. -The simple frames known to all beekeepers, while effective, are flimsy and prone to breakage. With the help of magic, you have devised an improved design to function longer by enchanting it with reinforcing magic. - -These improved versions can last several times longer than the basic frames, thanks to your new enchantments. -FRAMEMAGIC - - - -Resilient Frame -Making it better... -Having come up with an idea for an improved Magical Frame, the next logical step would be to reinforce the design further, shielding it from all but the harshest wear and tear. The trade-off, of course, would be an increased consumption of aura during its operation. -You have successfully created a design for a more durable Apiary Frame, the Resilient Frame. Like the Magic Frame, it will increase the bees' working speed and consume aura to offset received wear and tear. Unlike the Magic Frame, its expected lifespan is much longer. -FRAMERESILIENT - - - -Gentle Frame -You won't even notice I'm here. -Continuing from your curiosity into these flying creatures, an idea has occured to you how to encourage them to live slightly longer within the Apiaries. Perhaps if you could surround them with the essence of health, life, and the plants they love, you can realize this idea. -The Gentle Frame extends the life expectancy of a working queen by roughly a half, and encourages the workers to move at a slightly increased pace. The end result is that the bees live longer, and produce more while they are alive. -FRAMEGENTLE - - - -Metabolic Frame -And One! And Two! -Additional bee research has yielded insight into their body structure, metabolism, and life cycle. It is possible that you could create a frame to enhance their body processes. -The Metabolic Frame enhances the rate at which bees metabolize food, resulting in a higher work speed. However, this makes their genetic structure somewhat unstable and prone to mutations. While this can be frustrating for some apiarists, other, more prepared beekeepers have been known to use the Metabolic Frames in their apiaries to encourage mutations in bee species. - -It is rather less durable than the Magic Frame. -FRAMEMETABOLIC - - - -Necrotic Frame -Doom And Gloom, For Bees! -After being stung by a bee, you concocted an idea to make them pay. Surely placing a frame infused with death and envenomed intents in a hive will teach them a lesson! -Your vengeance-fuelled research has paid off, resulting in the knowledge of the Necrotic Frame. This frame, when placed in an Apiary, will cause the bees to become sluggish, reducing their work speed, and severely unhealthy, greatly diminishing the current generation's lifespan. However, it is prudent to ensure the enchantments in the frame only affect the current generation. -FRAMENECROTIC - - - -Temporal Frame -Why isn't it blue and boxy? -You have been seeking a way to significantly extend bee life. It should be possible by adding a frame enchanted with the essence of time to the hive. -Keeping bees has been frustrating, as the insects' short lives requires you to manually intervene far too often. - -A new variation of your frame design, this version involving some Time magic, should help extend their lives significantly. -FRAMETIME - - - -Void Capsule -Another Dimension of Liquid Storage -It seems reasonable that if you can shift blocks and other matter into an alternate dimension temporarily, you should be able to do something similar with liquids. -These new capsules can hold the equivalent of 8 buckets' worth of liquid by syphoning off a large quantity into a pocket dimension temporarily. - -Like other capsules, they are fragile and are typically single-use. They have proven popular for long-term storage. -VOIDCAPSULE - - - -Thaumium Scoop -Stronger, Faster, Bee-ter -It is possible to improve the durability of the scoop by creating them out of sterner materials. While you're at it, it may be helpful to enable them to be enchanted with restorative magics. -This improved scoop is more durable than the plain one your non-magical beekeeping friends are liable to use. It is good for three times as long as the average scoop at the cost of using some thaumium instead. - -Because the thaumium present in its construction, it is possible to enchant the scoop with a Repairing spell in the usual manner. -THAUMIUMSCOOP - - - -Thaumium Grafter -The Treesnipper -This improved grafter is more durable than the plain one your non-magical arborist acquaintances tend to use in their exploits. It should be possible to allow them to be enchanted with repairing magic to make them last indefinitely. -Adding Thaumium to your grafter design has increased its durability significantly - up to two times longer than regular grafters. - -It is also possible to enchant them with the Repair enchant, given sufficient experience. Using it rapidly may, however, give you a severe case of the munchies. -THAUMIUMGRAFTER - - - \ No newline at end of file diff --git a/src/main/resources/assets/magicbees/textures/items/liquids/Steam.png b/src/main/resources/assets/magicbees/textures/items/liquids/Steam.png deleted file mode 100644 index d4680fad2f86fd64cb034f44db5edff620c6c320..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1306 zcmai!TWB0r7=WiLS|f!teX$boFoDuy=W=Fece6vb$?imPQa!&=SQ56-BXq@KUg~5kzcb5ue0MOYx-&?L*N#X)StYlilVaivu&~ z!uQ|*e@={zKDw>zp)QW&wiQQ=5?j0Dck8|E`|#?&h%Gzm@B|$v71}@n=5jWf#GvS+ zDO|$Ho}F320~~kv?@oDwPMD8r7I8%sGh*cWOq$~c1|uI?HB7-Io^re_fAidzJaFtR ze;{efrmy3wGcp(8@ww5mHCMATHb1xz3`81J;9`nE_r( zl;x|G`kEv)8V#|L5J@m4!AvG2$%>>X0waWQ)}tsAys)pO!N8#vI6ifV2V#wAlGJII zXP&Nw;QDQ~UbvnnmM|$oz63=%4yg&+R-5zd!F1EOZAo|4V_}|;1^zoz!!2!p! zNh93AV*^o~?_M_s7Y+6GP@bdYNe(gfg4a(dK*#nzp!m- z6%x3J<==_BRr0;5rZv;lie5;OXW^oe(L3r}m$f_lVsw<1 zm@`t`og2Efb;U*?-nM6t9oo~2JvOodo6UtA=O18my;3xC<>;5MU;VCY0dyBGe9CuS zuOC^w`pIG8qlMqDMKj@^v4dB(tjzzloEZF|d;W_P`=5N_^IQGjhy5?-~VR&mSbS(-H~6UOw~3^6A>MJ7#w6 zTr~bvPaV3e_kCw^<<{~A``e4VhK}lcdaHjgOMO3`5%!H25C3>=$I-W5$sPad;2Vz* z^_+Wo>EiAemqwI&;>eZbX!qskR|nn+uitm*10p*w<->g K8mIG5&;JJ#7O+tO diff --git a/src/main/resources/assets/magicbees/textures/items/liquids/coal.png b/src/main/resources/assets/magicbees/textures/items/liquids/coal.png new file mode 100644 index 0000000000000000000000000000000000000000..56a52f95d03912207728b5dac7259a8249b08528 GIT binary patch literal 584 zcmV-O0=NB%P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0l7&;K~y+TZBxgp0znYmyC5irgLp7vKvB?x zm=H525d8ly5XGG9ZS~UQ2=7qL%yxH8ch#%|z~J$CIQRQq_UH3iRz2JJd_K-BPOx7$z591e$r*{|1Y^m;uM3I)_^H6#)V1cO1?#0s+^+xz{N z{c5#Br_({B(LgGd5(2;9?}ohG%jII~%tqNsGMmjX8ja-kd_Iq4GKoMS0LC~9^LQag zG6c3*)9Dn=W)rPe3-NdynM?-Za2TAQ1ls9#yY&btoURmdv)Q2A?V?yLN*9$%1))$# zI$$1GbxDfI%0f*T4u_x))oN8npbpf4dAr?Ca@oERur1C{BK^2rE-@aDMZ|Ksj9e~< zSS;p-JhwFe$3`84SS%JY!elbRU@$;BofiD}K7J00`FxIkzb_-OkTyml5zs!iulYP1 zTL_M@-|rpX&SE-22RH&BlIH1aJRXmph$!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPVk-lnPX{!qdeu z#KM2+Bwe9H1`;mWD;*vfdib3ey&%IVdysKO2WM?bncCrX3JUj@+^szM{b_pE+P|(m z?i~+bMtPtAxvBT$R))UqQGDN{OwOHuYrRwKz@96cq7(1fZ*x`HDaNo#EhtjuI#a^= z&L>d}CuF2z4^&&fwgig2Sp7<^?pBjpH%PozTnVU_`@$xz*I|>g83W#K=KeQ1n{kEF k3tk@EC4xymY;&s^ciep&_{IBNAJEMVp00i_>zopr02^IyFaQ7m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/magicbees/textures/items/liquids/ender.png b/src/main/resources/assets/magicbees/textures/items/liquids/ender.png new file mode 100644 index 0000000000000000000000000000000000000000..02a3753b6990e9b33c0fdb63ff00940ed83ed235 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPVk-lnPX{&C|s( z#KM2+#Era%9C%zWGqQ?sa7vk-V2M=FPHFF%$h*nol+UC?mu0HdB_n@`vve&#UAuSl z+}+Ejd=fXh)6CN!n|^L#?tKk&Rsrq`!LX;x82oDUpC=l`ufH6!f9hBIYg`?6YBHqQd!)PX)NH6I6a*@su+wB&!|`3$ssr-46w1C%|M61%&xXZ!L>P+Z z916_iYGCSlGxu-kl-W!RZa)`!Gj(>;-V-0Hy*@LY|IzdL>Z<-TKp!x8y85}Sb4q9e E0IdLb6aWAK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/magicbees/textures/items/liquids/glowstone.png b/src/main/resources/assets/magicbees/textures/items/liquids/glowstone.png new file mode 100644 index 0000000000000000000000000000000000000000..767ea29a29653b73177ad9e1222f367c66d04dfe GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J=4@yqg0@pH=Ztz zAr}5iC++1r2!RAA=u# z-@xgSd10RH?&OZAYkqDAN_<^qX`FRD-$X!Xy%0m$5vMbZ<_!jaqT^HIni&zNx+JOVF6TSuqG=BjHGEUEfc|FiboFyt=akR{ E05DRD+yDRo literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/magicbees/textures/items/liquids/mana.png b/src/main/resources/assets/magicbees/textures/items/liquids/mana.png new file mode 100644 index 0000000000000000000000000000000000000000..b964623e77996c2e85787096c5080de6ba8eb33d GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J=4@yqg0@p)t)Yn zAr}5iCvD_paujh{u9j>pZD49>D$K)rP;bpavo{CiT3A;{RI#sVXpU*HJl1(j_iGRS!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J=4@yqg0@pH=Ztz zAr}5igKYU79R+IkyVS4N^G!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J=4@yqg0@p*`6+r zAr}5iCmrN%HV|N$D8QlREBsO+H^5oyh?VPHx7AUrZjpMm5(~7TMpVb(@@UNJ;Jz)z_v_M@Wp3$WKR=zKz7bDOD`-^M8 Y{^`-ZJ?r9MpfedfUHx3vIVCg!01dEgTL1t6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/magicbees/textures/items/liquids/steam.png b/src/main/resources/assets/magicbees/textures/items/liquids/steam.png new file mode 100644 index 0000000000000000000000000000000000000000..5b2c8df667806c0ddbd0c51734dbd7b33b5d40ab GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J=4@yqg0@pX`U{Q zAr}5iCwg-oP~dT?{(rdRQM#g@jl;W?nNA85B2C^tTF7VY+;rXYxp+vA!_lCwD^aOE zipA%i&np&tR?6hynC<)R-ll6+?;bMgzT8_s+rd#H-Ros-V_S}61ry80Cb0)8aq0{# zCG~f{p55ceP{!KB=Op~#f3Cy>Ft?ohvlZik9wyb8gywA>m2(AJyWU$~=M`A^^`Q)d S%vzue89ZJ6T-G@yGywn*d1Ofd literal 0 HcmV?d00001