Commit graph

374 commits

Author SHA1 Message Date
Nick
40cb3a501a Fix all (known) instances of ugly 2D item model rendering 2015-10-08 23:56:22 -07:00
Nick
731f92a7fd Rework commands to be sub commands of /bloodmagic 2015-10-08 23:56:00 -07:00
Nick
fa78706fca Allow Creative players to bypass Aura of Expulsion 2015-10-08 23:55:26 -07:00
WayofTime
9fb1f61a6a Merge pull request #464 from TehNut/master
Various fixes and improvements (Details in description)
2015-10-07 18:55:51 -04:00
Nick
a91d350037 Altar now accepts Chisel variants of given blocks
Will require a re-setup of the workspace (`gradlew [eclipse|idea]`) in order to download the Chisel API. This launches just fine without Chisel installed.
2015-10-06 23:04:39 -07:00
Nick
83b26eb033 Fix my breakage of the altar checking 2015-10-06 22:08:51 -07:00
Nick
250debb604 Drastically improve the Teleposer Blacklist
It now functions correctly. Only downside to this is that currently using the wildcard value of `*` does not work. Need to figure out how to cleanly do that.
2015-10-06 20:38:01 -07:00
Nick
4a86518366 Should fix getting free iron buckets from non-iron buckets 2015-10-06 19:45:46 -07:00
Nick
bd4b2d2c52 Fix z-fighting of blood in altar when there is none 2015-10-06 19:40:47 -07:00
Nick
27ac16b5d2 Allow disabling of Weak Rituals 2015-10-06 19:23:25 -07:00
WayofTime
47849d4ab2 Merge pull request #463 from UndeadZeratul/Fix-Harvest-Levels
Allow Bound Tool Harvest Levels to be Altered
2015-10-06 21:27:45 -04:00
Nick
fca3a60a1e Allow any instanceof BlockBeacon 2015-10-06 18:24:12 -07:00
UndeadZeratul
eaa20628ce Fix Bound Tool Harvest Levels
This way, they'll be 5 by default, but since they now follow Forge's normal way of getting/setting the harvest level on tools, other mods - such as Iguana Tinker Tweaks - can alter their harvest levels as desired.  When the tools are not activated, they will now return a -1 instead of 0, which results in not being able to be used as a tool at all, rather than the equivalent of a wooden tool.
2015-10-06 18:45:24 -05:00
WayofTime
b2985550dc Merge pull request #449 from iambob314/patch-1
Added more biome control in BiomeChanger ritual
2015-10-04 18:42:18 -04:00
Arcaratus
68babbca11 Added a package-info.java file 2015-09-17 15:39:54 -04:00
iambob314
5d94e59314 Actually default to Plains on too much biome skip
(Also cleaned up code style)
2015-09-09 19:02:46 -04:00
iambob314
3cf20bac43 Added more biome control in BiomeChanger ritual
Added the ability to select between matching biomes in the biome changer ritual (Ritual of Gaia's Transformation). Previously, the ritual would always select the first biome that (approximately) matches the given temperature/humidity. However, especially with a mod like Biomes O' Plenty or similar installed, many biomes may match such a specification, and thus many are inaccessible to this ritual.

The added specificity is based a class of additional control items, colored wool, to be placed on the plinths. If one or more colored wool are present, they combine together to yield a "biome skip count," which indicates how many matching biome IDs to skip before settling on one. Since the absence of any wool counts as a skip value of 0, a wool with damage value of 0 counts as 1 skip, a damage value of 1 counts as 2, etc. Multiple wools sum together. If the biome skip count is greater than the number of matching biomes, the ritual defaults to plains, just as if no matching biome were found.

While it's not expected that a player will know the exact skip count to use, trial-and-error can enable fine-grained control, as opposed to the task of specific biome selection often being impossible before.

Example:
* 2 coal and 3 lapis are placed on the plinths, yielding 0.7 temperature and 0.8 humidity.
* Normally, this would always evaluate to biome ID 4, vanilla Forest.
* However, we additionally add one Orange Wool (damage value 1), adding 2 to the biome skip counter. Equivalently, we could have added two White Wools (damage value 0).
* Now, the first two matching biomes will be skipped, and the third is used (likely biome ID 29, Roofed Forest, depending on modpack).
2015-09-09 01:21:50 -04:00
Arcaratus
a36c514b63 Fix TEBelljar and #433 2015-08-27 13:02:14 -04:00
WayofTime
cd34cb30e8 Fixed the routing focus texture name. 2015-08-23 18:26:20 -04:00
Arcaratus
245bfc96ca Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-08-10 22:03:38 -04:00
Arcaratus
8896414a51 Vacation commit 2015-08-10 22:03:08 -04:00
WayofTime
1aac4686db Attempt to fix repository 2015-07-31 12:09:09 -04:00
WayofTime
e242207d50 Re-refixed TEBelljar 2015-07-31 11:45:50 -04:00
WayofTime
91ad8debe2 Merge pull request #412 from Arcaratus/bloodmagic1.8
Finished all porting
2015-07-31 11:42:07 -04:00
Arcaratus
d528bdbbf8 Finished all porting 2015-07-31 11:35:05 -04:00
WayofTime
1bd90ff01c Fixed TEBellJar calls (may need to be changed back again...) 2015-07-30 20:50:48 -04:00
Arcaratus
93e5e6cca6 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 2015-07-30 17:29:08 -04:00
WayofTime
f009d58f74 Fixes 2015-07-30 17:24:46 -04:00
Arcaratus
a2c4f4b965 All the items !sigils 2015-07-30 17:24:20 -04:00
Arcaratus
d88cc2d79e Finished ModItems 2015-07-30 15:53:50 -04:00
Arcaratus
a9507b3b68 Finished (almost) everything !items 2015-07-30 14:52:39 -04:00
Arcaratus
2472cad9f1 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 2015-07-30 10:24:44 -04:00
Arcaratus
b2f7ec6030 Finished TileEntities 2015-07-30 10:21:53 -04:00
WayofTime
d0b15c29de Made the Toggleable sigil to make it easier for toggle sigils. Will replace the NBT editing in the sigils. 2015-07-30 10:16:16 -04:00
WayofTime
230b44fe88 Finished all errors except for the sigils. 2015-07-30 09:31:16 -04:00
WayofTime
9e2c0e6e74 Fixed non-armour and non-sigil items 2015-07-30 08:44:01 -04:00
WayofTime
8241c3cbd1 Added the .jsons for the base runes and added the BlockStates to it. 2015-07-29 22:07:13 -04:00
WayofTime
aed8436204 Deleted unused resources, added a test .json for the armour forge. 2015-07-29 21:45:19 -04:00
WayofTime
b14f2898e8 Fixed Block item renderers 2015-07-29 18:34:15 -04:00
WayofTime
b406b581a0 Temporarily removed Pam harvest handlers. 2015-07-29 18:17:50 -04:00
WayofTime
94b74fe309 Randoms. 2015-07-29 18:15:25 -04:00
WayofTime
800bf06872 Finished the old TESR's of the custom rendered blocks, will transition to .jsons when convenient. 2015-07-29 17:37:08 -04:00
WayofTime
977b6ce29d Finished fixing the raw Tile altar, and finished the Omega structure. 2015-07-29 15:04:00 -04:00
WayofTime
cd5a52c7fb Merge pull request #406 from Arcaratus/bloodmagic1.8
Add BlockRender code
2015-07-29 14:47:12 -04:00
WayofTime
dd07defe1f Quick render stuff 2015-07-29 14:46:53 -04:00
Arcaratus
cfed9f5ab3 Add BlockRender code 2015-07-29 14:44:14 -04:00
WayofTime
ffd5a672cb Merge pull request #405 from Arcaratus/bloodmagic1.8
Finished all Blocks
2015-07-29 14:38:47 -04:00
WayofTime
1aa343624e Finished the rituals 2015-07-29 14:37:45 -04:00
Arcaratus
419f532502 Finished all Blocks 2015-07-29 14:35:00 -04:00
WayofTime
86b753d098 Finished almost all rituals. 2015-07-29 14:26:37 -04:00