From 4ec9261b4199df9e485b1a9be87d8117b0210e06 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 5 Aug 2013 13:36:19 -0700 Subject: [PATCH] Crafting Station Start --- assets/tinker/lang/en_US.xml | 11 + assets/tinker/manuals/firstday.xml | 76 ++--- assets/tinker/manuals/smeltery.xml | 16 + .../blocks/craftingstation_bottom.png | Bin 0 -> 463 bytes .../textures/blocks/craftingstation_side.png | Bin 0 -> 547 bytes .../textures/blocks/craftingstation_top.png | Bin 0 -> 787 bytes mods/tinker/textures/blocks/punji.png | Bin 0 -> 287 bytes .../textures/blocks/smeltery_furnace_off.png | Bin 0 -> 640 bytes .../textures/blocks/smeltery_furnace_on.png | Bin 0 -> 629 bytes mods/tinker/textures/gui/crafting.png | Bin 0 -> 2719 bytes tconstruct/blocks/GolemHeadBlock.java | 3 +- tconstruct/blocks/RedstoneMachine.java | 6 +- tconstruct/client/TProxyClient.java | 39 ++- tconstruct/common/TContent.java | 280 ++++++++++++++---- tconstruct/common/TProxyCommon.java | 10 +- tconstruct/entity/Automaton.java | 4 +- tconstruct/inventory/MiniGardyContainer.java | 2 +- tconstruct/items/TitleIcon.java | 7 +- tconstruct/items/tools/Battleaxe.java | 3 + tconstruct/items/tools/Cleaver.java | 2 +- tconstruct/items/tools/Excavator.java | 5 +- tconstruct/items/tools/Hammer.java | 7 +- tconstruct/items/tools/LumberAxe.java | 7 +- tconstruct/items/tools/Scythe.java | 3 + tconstruct/library/tools/AbilityHelper.java | 19 +- tconstruct/util/PHConstruct.java | 48 ++- tconstruct/util/player/TPlayerHandler.java | 2 +- test/EncodingSequence.java | 6 - test/Trait.java | 64 ---- 29 files changed, 371 insertions(+), 249 deletions(-) create mode 100644 mods/tinker/textures/blocks/craftingstation_bottom.png create mode 100644 mods/tinker/textures/blocks/craftingstation_side.png create mode 100644 mods/tinker/textures/blocks/craftingstation_top.png create mode 100644 mods/tinker/textures/blocks/punji.png create mode 100644 mods/tinker/textures/blocks/smeltery_furnace_off.png create mode 100644 mods/tinker/textures/blocks/smeltery_furnace_on.png create mode 100644 mods/tinker/textures/gui/crafting.png delete mode 100644 test/EncodingSequence.java delete mode 100644 test/Trait.java diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml index 8cccdb30..84c75bc2 100644 --- a/assets/tinker/lang/en_US.xml +++ b/assets/tinker/lang/en_US.xml @@ -150,11 +150,16 @@ Aluminum Nugget Fake Essence Crystal Aluminum Brass Nugget +<<<<<<< HEAD:assets/tinker/lang/en_US.xml <<<<<<< HEAD:assets/tinker/lang/en_US.xml Silky Cloth Silky Jewel ======= >>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml +======= + Silky Cloth + Silky Jewel +>>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml Obsidian Nugget Cobalt Nugget Ardite Nugget @@ -188,14 +193,20 @@ Igniter Landmine <<<<<<< HEAD:assets/tinker/lang/en_US.xml +<<<<<<< HEAD:assets/tinker/lang/en_US.xml +======= +>>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml Punji Stick Oak Barricade Spruce Barricade Birch Barricade Jungle Barricade +<<<<<<< HEAD:assets/tinker/lang/en_US.xml Essence Extractor ======= >>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml +======= +>>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml Block of Cobalt Block of Ardite diff --git a/assets/tinker/manuals/firstday.xml b/assets/tinker/manuals/firstday.xml index 42a7e46f..5f069fa4 100644 --- a/assets/tinker/manuals/firstday.xml +++ b/assets/tinker/manuals/firstday.xml @@ -98,26 +98,22 @@ The berries can be melted down into nuggets and ingots, making them an invaluabl + +A few traps or blockades may help with your early survival experience + + -Materials and You: v1 +Punji Stick - patternbook1 - two + punji + three -Materials and You: v2 +Barricade - patternbook2 - two - - - - -Mighty Smelting - - patternbook3 + barricade two @@ -157,59 +153,31 @@ Note: The Smeltery is required to process all metals, including iron. + +If you ever find yourself without this book, a new one is simple to make. Other books can be made from this one as well. + + -Smeltery Drain +Materials and You: v1 - smelterydrain - three + patternbook1 + two -Lava Tank +Materials and You: v2 - smelterytank1 - three + patternbook2 + two -Seared Glass +Mighty Smelting - smelterytank2 - three - - - - -Seared Window - - smelterytank3 - three - - - - -Seared Faucet - - smelteryfaucet - three - - - - -Casting Table - - smelterytable - three - - - - -Casting Basin - - smelterybasin - three + patternbook3 + two diff --git a/assets/tinker/manuals/smeltery.xml b/assets/tinker/manuals/smeltery.xml index 36f59ac5..6a6f9cc6 100644 --- a/assets/tinker/manuals/smeltery.xml +++ b/assets/tinker/manuals/smeltery.xml @@ -240,4 +240,20 @@ Part casts must be created by pouring metal around existing parts, like a pickax searedstone + +Drawbridge + + drawbridge + three + + + + +Igniter + + igniter + three + + + \ No newline at end of file diff --git a/mods/tinker/textures/blocks/craftingstation_bottom.png b/mods/tinker/textures/blocks/craftingstation_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..0d2abb0a2103ec2327ace3a257b339af6ef00a3a GIT binary patch literal 463 zcmV;=0WkiFP)CC{!%+K&AU69y1GF7V7g~1cD zyVPlP>QWZ&WV`8`e7QT{z2}$g^W*hkoJEMbtN;K+1lxFtQy6D)#tl_oV7Ydv@&ZHz z<1B3BrO-Gl--$>rQGBqC$FN^YQ`#j==Cme3T?ZOVy;!s zPxm;bfpHdfSxJ7mc9@Lrq)uxM)s-Y7XszYUbS9%hC;|W)55?2!vWgl*ZFsf6BVV=dO+KAt!8M6A0vp1WqtrAPA|``%n0HS&DER*ocL~amNM3 zG*>L-kli%di!krr-esztdEd-@^Udte_0`3@wKV`r#Q<1a^CgC_zy1Jl`S}yi z8;Cc-M%LC$Mm_Sf@Q;}`++tBBkO+ve;zQ<0kmtX4cm1 zTwh(hOJG0RW3gNVaCCUUV!8HIB_V&S$c|GVivYT94ZzcnIp=35WZD4WoTFG(-WS@# z{wV;r53d^y0H(7N0F$IXQA|cONs6_#e^V-E_vr9|OdH074gkffqF7a!B*i2t(^*NT zO@l?~M~mg!cTg(!OrUJg4p;4*`>TOcv9C6rm2}(M`*~TAY2zD6@o<$2Jm_F;?eW&mH(Lmk!VCQO2IMW=P?Wz_4bWuNdL zp+zX#?Zc~Q^TeDeJ5I^V!V8p_1>->n=iGnyAee4jdmVOVuX2sjRqi1aci2Bgww7sw lQgQQNkTJGtunnVB%m=|G;A8a4r^x^S002ovPDHLkV1gf<{`~*| literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/craftingstation_top.png b/mods/tinker/textures/blocks/craftingstation_top.png new file mode 100644 index 0000000000000000000000000000000000000000..8d6bccfd8d34ab2bb8270306aaec3069474cdb25 GIT binary patch literal 787 zcmV+u1MK{XP)(c-L0-#Am zK~y-)b(76&6I&R@f9E4JotdOJHEL~&f+=3TS4)*xv8jTKSWsw1daojo7kS40@_WVI5s#r4`U2M2qwz?JejQnAbmgJ^zLm$VTh1|^Mggs{n?&Y#E??K1EG#Us(QYB^46A-Xqy8CV3~>|# zFl>=n0FY9Gft!!s(e8BU$>(@j`$jOoOqc6$e_@Td)xpWSNF`Gxa%OH3gh(RMnky&v zF;yvnfXkx;T&o@e15=d}*Q$Rbq)5RtbBiQY#^A3t38Qc;XtT9MKpY#iP6WqsjFc+5 zx^by&3dJ4Fzx~LA_YHKHO*;&6Z97fD_FP&)fTc82Nyd*9>2@4eKQ$5sVHnc8XB%;B z7~famVx>eY2$(4Mb828aUmELN7}?9!QwNf+zu1tkwT1XG11IN!F?4r1SW1(%Y)Yj* z^7$;`YBL2XmB@dsEyRESl+Diz+Ru}vCa!BGF-}&8 zxOMLpgnM1hHql6Mq-(`;_rXu{R&J?~_cO0T2Kr0I$8&Q-OYJ}zgpfZ6GjPI37)W1Ic| z`wkkqOlOoKKk8XQzH=~*hNBHC(@qoi`4WwOKdhBx6gpLCwE$(<{4$Xf8ogdu#v!qdTX a_!vGmmN#YI+prqwZU#?RKbLh*2~7Z0yl7+q literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/smeltery_furnace_off.png b/mods/tinker/textures/blocks/smeltery_furnace_off.png new file mode 100644 index 0000000000000000000000000000000000000000..de9b011603a622ebfa4a044339b7ce520555d754 GIT binary patch literal 640 zcmV-`0)PF9P)Od5Rzl?Ca%|OCX+c%BD9tyVjFl;Z$ODFA{X;O_1Y7a)ov z0N&o-07#MqDJ5B!v0kt7JP)lk?RMJ|ZMR#1Z-U8WLZwonQmLS|W;h)3Ta-#AN~O|~ z67lu*Wt%jg&lwB`{4ZW#U(s6AY&L1NT0aVw%jHp`loBBXg+hTeO(_%#2qF0R_~1~n zCCDv&e}AXj?H(l@-v1U(wOY-jl-31f3;Hp98S zz0D5&9*suqc02n0{?Si2H#Y!WUtin#xWB*0{k!W=Pfx!}&GBNfh?LUeF2H89AqWB< zA0MgL>ztgN{M6_;q-lx}0cx@q8zwl*Dmt axAPCEE&@(ucx$o%0000TZ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/smeltery_furnace_on.png b/mods/tinker/textures/blocks/smeltery_furnace_on.png new file mode 100644 index 0000000000000000000000000000000000000000..aa10a92f85ecaf68ee87572cdf2b066de1030994 GIT binary patch literal 629 zcmV-*0*d{KP)OdHUKM!DG!~lT`WU+!MC<|Z>EFcYRfIX#1fy5eU5EZ1j4TvadkQGJY zA+RwS857?EJl90IN19^Joc}TZ!{~H6kx~lFvIxTv*L5ir3IsvG>2x9q(=>5i7a;^u z6fv1hNS{t89LJ$tE^Fa#w_~wb=zG0h2OtOnrqe04S`7fhFfeS}j%?e;_kGsuH9`mg zEX%_8eeFakMGyp3t5tHj9NX;{&+|yPS}g$9>ouln0#GWIu8d+Hz;#^!3WWl_UXL_@ z<2V4!=W_sj-$zPG6h-WIJ519=DaGC0op$u~^#yQtuvjd}=kw(Ad6ZJTyu9!mve_)z zZ1yS>aXcP%kyfh}uO)8Z_2*Gl> zB$=^x5V!FC{hd~;btOo?{|2L2EJjjF-Gv|s0I+Qv$8o4sDtvr=kjZ4QZCe-6vMfG7 zKQX%9Zj|iz>+36F7&01-t|B#?O#tri@AZ82`+d?st3DhK0SJLV7p?)MFMKAGK}xCh z0${)2BZOc$9P)fI<`Ej<`S5t=o`Jz&z;?UUqb`!Oesgm}BM$!nJYCMinQJ5p8rvA{ zb~}1|dn3-|C*p3zhMUbs>z2#qd6^D}1G!ud&-1SSm*nG}kW%7#p5D&CHR1xi^fK0n P00000NkvXXu0mjfEMg3y literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/gui/crafting.png b/mods/tinker/textures/gui/crafting.png new file mode 100644 index 0000000000000000000000000000000000000000..254daccd71bfe74ce2d816ec2837d348828db29f GIT binary patch literal 2719 zcmeHJ30D(Y7JgL}AqiVZz)rx%u-UYY5EhZv0TM)IUu4w=3nLjW+b55T=XU;wKUe$f?)V=S! z-*>CN_43%SO4cR=092iw91j2hVYd(<60j-gWK9G%AxAmx900E8Dt`!7#GXlfr-QKo zsNKUaNXys-1%S+PcI5abhP-;Fn*VecW$(m@))%3E^V!G$cEW<<0CcW|*EYn|)$DAf zH&4>WdENHQ!^7j1z4AsodYD9MA^xlOeU#fP9Hw$wrGj7QH;rOsP#rEImJhs)GTVzP z5I?+*vG0&|RJ}})+zwRRhM5bTvU$JpWt!&A7G`5U{0wPx$q6|?0 zL_rHsjxJw~D`m;Xh6F>_wrJJQyGhgHEpV2qk2o?3B!OC?ZxXm(IuZmjf0#J%{>uuF zt{v6Zj!(K1t@}X16_x$cm5)b{##hMEUy%e>wEVIzBhjQ%s9wjJg4&N{LJ45-C4Jd(g^N z$VF&G>&)3dm~;Gz0@0;Sk3HX#@$X1r4{j(^oetCCi`s3|5Mne=5n;x(c4J(bfu=DF zbBp#WBXKXo#;MOwb}tVW7BnPl2mz;iCnAwkn9m89TU;+}Hx*C;benulx(z^`gz&~8 z>n(85;-p!sQCv*itp)NxLoRr$JtBGaGzhqgi(&<|FAE07?i8hrA2D$QhX-51H)N8P zhGWGmv8^Z+!=mSpteO1n+fV zi6GJ7Rvw^|xPM$BG4-{1kC~_;ykhtPVeP|K^05S^gTK(&j#lCt4yaJ(y04J9Ilt`t z+6elS33_wlGc@a1jyEqBD_nu6Z?en1L%f3lkeJAy@sBn|jV$N;KAvWzO&wPE0GA%o zdGEHufw7CLA1yBQ5qnBWqZRDB{R8I;JhGPu6OAqVF=2&F>*X@iMM+%DB^h@)0tXEYGTd|Cazb&d>^k!(ah_}p(*uC%w}%}zRLZr( z$ZDg+;-5`gm~D?N(`9=t3wkh_T%7gRz{aPcmb&4|(Uu#^8H>`xG6XQ6%6g#iBc!sq z`rP;LJz#=SO7%tn-9kNfJssB;)7q!Du2oYs_Qjpzl<^l)cZr&m^Ig#fqhG)dw! z9N>pG8QTLq@iYI=U1o|8N9USvzI^K`dsE!Hyu|Vf-g8!CdUZzB!a#M~bIX^e2IK5k zS8ba!fi_u`!yc&gom*;o*J|hI1Q6*7X~}ENCg6g*=_Cr?Q4*qIyTG18(f^<_3q6v#>wWu)~Hzl+$CRbG{W_0bIG zR>WM-$w=LXG;LT_fEL~>Ja2-ZCd?`Fk~P-FDC|r8aAQ{-d`AAE+S7PFygmHdo)i`2H)R;eE}sZ2EX`-&1LyQ7}q)VG4ba{SvgfPbNe)aH!W-+8ZnY6(l6K&DpH zq@C&D3zMc>bNn(zn;+VXojE*(^}zmcb}s0}WVn%~;h1ea+^ z>P2yuPvYWY;ZhoFNHeM$$(E6DoI4}7`R%~dbkZ7;h_M=6)DYcVUF>3ZP|rq$v}Vr9 z?PDsJW{Nu!kh=`yhYIoWX`W5$L;-hs(It4id8%D-#? 0) - player.heal(random.nextInt(drain + 1)); + if (!PHConstruct.necroticUHS || (entity instanceof IMob && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).func_110143_aJ() <= 0)) + { + int drain = toolTags.getInteger("Necrotic") * 2; + if (drain > 0) + player.heal(random.nextInt(drain + 1)); + } if (knockback > 0) { diff --git a/tconstruct/util/PHConstruct.java b/tconstruct/util/PHConstruct.java index a8aff134..c22b4035 100644 --- a/tconstruct/util/PHConstruct.java +++ b/tconstruct/util/PHConstruct.java @@ -56,7 +56,7 @@ public class PHConstruct enableTSlime = config.get("Difficulty Changes", "Enable mod slime tools", true).getBoolean(true); enableTPaper = config.get("Difficulty Changes", "Enable mod paper tools", true).getBoolean(true); enableTBlueSlime = config.get("Difficulty Changes", "Enable mod blue slime tools", true).getBoolean(true); - + craftMetalTools = config.get("Difficulty Changes", "Craft metals with Wood Patterns", false).getBoolean(false); vanillaMetalBlocks = config.get("Difficulty Changes", "Craft vanilla metal blocks", true).getBoolean(true); lavaFortuneInteraction = config.get("Difficulty Changes", "Enable Auto-Smelt and Fortune interaction", true).getBoolean(true); @@ -73,6 +73,7 @@ public class PHConstruct blueSlime = config.get("Mob Spawning", "Activate Blue Slime Spawns", true).getBoolean(true); blueSlimeWeight = config.get("Mob Spawning", "Spawn Weight for Blue Slime", 6).getInt(6); + //1467-1489 woodStation = config.getBlock("Wood Tool Station", 1471).getInt(1471); heldItemBlock = config.getBlock("Held Item Block", 1472).getInt(1472); lavaTank = config.getBlock("Lava Tank", 1473).getInt(1473); @@ -96,13 +97,13 @@ public class PHConstruct landmine = config.getBlock("Landmine", 1470).getInt(1470); toolForge = config.getBlock("Tool Forge", 1468).getInt(1468); multiBrickFancy = config.getBlock("Multi Brick Fancy", 1467).getInt(1467); - + barricadeOak = config.getBlock("Oak Barricade", 1469).getInt(1469); barricadeSpruce = config.getBlock("Spruce Barricade", 1482).getInt(1482); barricadeBirch = config.getBlock("Birch Barricade", 1483).getInt(1483); barricadeJungle = config.getBlock("Jungle Barricade", 1487).getInt(1487); - - //Thermal Expansion + + //Thermal Expansion moltenSilver = config.getBlock("Molten Silver", 3195).getInt(3195); moltenLead = config.getBlock("Molten Lead", 3196).getInt(3196); moltenNickel = config.getBlock("Molten Nickel", 3197).getInt(3197); @@ -128,6 +129,7 @@ public class PHConstruct blood = config.getBlock("Liquid Cow", 3217).getInt(3217); moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218); + //3221+ aggregator = config.getBlock("Aggregator", 3221).getInt(3221); lightCrystalBase = config.getBlock("Light Crystal", 3222).getInt(3222); glass = config.getBlock("Clear Glass", 3223).getInt(3223); @@ -137,34 +139,28 @@ public class PHConstruct dryingRack = config.getBlock("Drying Rack", 3227).getInt(3227); glassPane = config.getBlock("Glass Pane", 3228).getInt(3228); stainedGlassClearPane = config.getBlock("Clear Stained Glass Pane", 3229).getInt(3229); - + searedSlab = config.getBlock("Seared Slab", 3230).getInt(3230); speedSlab = config.getBlock("Speed Slab", 3231).getInt(3231); //grassSlab = config.getBlock("Grass Slab", 3230).getInt(3230); - + punji = config.getBlock("Punji", 3232).getInt(3232); woodCrafter = config.getBlock("Crafting Station", 3233).getInt(3233); essenceExtractor = config.getBlock("Essence Extractor", 3234).getInt(3234); - + slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235); slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237); slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238); slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239); slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240); slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241); - + meatBlock = config.getBlock("Meat Block", 3242).getInt(3242); woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243); woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244); woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); - /*golemCore = config.getBlock("Golem Core", 1481).getInt(1481); - golemHead = config.getBlock("Golem Head", 1482).getInt(1482);*/ - //golemPedestal = config.getBlock("Golem Pedestal", 1483).getInt(1483); - //redstoneBallRepeater = config.getBlock("Redstone Ball Repeater", 1483).getInt(1483); - //netherOreBerry = config.getBlock("Ore Berry Nether", 1487).getInt(1487); - manual = config.getItem("Patterns and Misc", "Tinker's Manual", 14018).getInt(14018); blankPattern = config.getItem("Patterns and Misc", "Blank Patterns", 14019).getInt(14019); materials = config.getItem("Patterns and Misc", "Materials", 14020).getInt(14020); @@ -332,8 +328,9 @@ public class PHConstruct uhcGhastDrops = config.get("Ultra Hardcore Changes", "Change Ghast drops to Gold Ingots", false).getBoolean(false); worldBorder = config.get("Ultra Hardcore Changes", "Add World Border", false).getBoolean(false); worldBorderSize = config.get("Ultra Hardcore Changes", "World Border Radius", 1000).getInt(1000); - freePatterns = config.get("Ultra Hardcore Changes", "Add Patterns to Pattern Chests", false).getBoolean(false); //Check - + freePatterns = config.get("Ultra Hardcore Changes", "Add Patterns to Pattern Chests", false).getBoolean(false); + necroticUHS = config.get("Ultra Hardcore Changes", "Necrotic modifier only heals on hostile mob kills", false).getBoolean(false); + //Slime pools islandRarity = config.get("Worldgen", "Slime Island Rarity", 1450).getInt(1450); @@ -341,7 +338,7 @@ public class PHConstruct Property conTexMode = config.get("Looks", "Connected Textures Enabled", true); conTexMode.comment = "0 = disabled, 1 = enabled, 2 = enabled + ignore stained glass meta"; connectedTexturesMode = conTexMode.getInt(2); - + /* Save the configuration file */ config.save(); @@ -361,7 +358,7 @@ public class PHConstruct public static int heldItemBlock; public static int woodCrafter; public static int woodCrafterSlab; - + public static int ores; public static int lavaTank; public static int smeltery; @@ -375,10 +372,6 @@ public class PHConstruct public static int redstoneMachine; public static int dryingRack; - /*public static int golemCore; - public static int golemHead; - public static int golemPedestal;*/ - //Crops public static int oreBerry; public static int oreBerrySecond; @@ -409,7 +402,7 @@ public class PHConstruct //Liquids public static int metalFlowing; public static int metalStill; - + public static int moltenIron; public static int moltenGold; public static int moltenCopper; @@ -434,7 +427,7 @@ public class PHConstruct public static int moltenShiny; public static int moltenInvar; public static int moltenElectrum; - + //Slime public static int slimePoolBlue; public static int slimeGel; @@ -637,7 +630,7 @@ public class PHConstruct public static boolean stencilTableCrafting; public static boolean miningLevelIncrease; public static boolean denyMattock; - + //Ultra Hardcore modifiers public static boolean enableHealthRegen; public static boolean goldAppleRecipe; @@ -647,6 +640,7 @@ public class PHConstruct public static int worldBorderSize; public static boolean freePatterns; public static int goldHead; + public static boolean necroticUHS; //Superfun public static boolean superfunWorld; @@ -654,9 +648,9 @@ public class PHConstruct public static boolean gregtech; public static boolean lavaFortuneInteraction; - + public static int islandRarity; - + //Looks public static int connectedTexturesMode; } diff --git a/tconstruct/util/player/TPlayerHandler.java b/tconstruct/util/player/TPlayerHandler.java index da53f976..66625b43 100644 --- a/tconstruct/util/player/TPlayerHandler.java +++ b/tconstruct/util/player/TPlayerHandler.java @@ -71,7 +71,7 @@ public class TPlayerHandler implements IPlayerTracker playerStats.put(entityplayer.username, stats); - if (PHConstruct.gregtech) + if (PHConstruct.gregtech && Loader.isModLoaded("GregTech-Addon")) { PHConstruct.gregtech = false; if (PHConstruct.lavaFortuneInteraction) diff --git a/test/EncodingSequence.java b/test/EncodingSequence.java deleted file mode 100644 index ca6c7544..00000000 --- a/test/EncodingSequence.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; - -public class EncodingSequence -{ - -} diff --git a/test/Trait.java b/test/Trait.java deleted file mode 100644 index 23342145..00000000 --- a/test/Trait.java +++ /dev/null @@ -1,64 +0,0 @@ -package test; - -import java.util.Random; - -//Quantitive Trait Locus -public class Trait -{ - protected int[] alleles; - static Random rand = new Random(); - - public int getAverage () - { - int average = 0; - - if (alleles.length > 0) - { - for (byte i = 0; i < alleles.length; i++) - average += alleles[i]; - - average /= alleles.length; - } - - return average; - } - - public int[] breed (byte[] other, float[] mutation) - { - assert alleles.length == other.length : "Complete trait arrays need to have identical length"; - - int[] result = new int[alleles.length > other.length ? alleles.length : other.length]; - - for (int i = 0; i < result.length; i++) - { - if (rand.nextFloat() < mutation[0]) - { - result[i] = mutate(alleles[i], other[i], mutation[1]); - } - else - { - result[i] = rand.nextBoolean() ? alleles[i] : other[i]; - } - } - - return result; - } - - //Assumes linear progression from worst to best. Use other methods for other types - protected int mutate (int allele, int other, float variance) - { - int mutator = rand.nextBoolean() ? allele : other; - double bellcurve = rand.nextGaussian(); - double offset = variance * bellcurve; - offset -= offset / 2; - - if (mutator + offset < 0) - mutator = 0; - else if (mutator + offset > Integer.MAX_VALUE) - mutator = Integer.MAX_VALUE; - else - mutator = (int) (mutator + offset); - - return mutator; - } -}