Commit Graph
841 Commits
Author SHA1 Message Date
Martin Robertz fd09bc9c8e Merge remote-tracking branch 'origin/structurelib' into dev 1.7.16-pre 2025-05-04 12:52:12 +02:00
Martin Robertz 711a0b8048 Merge remote-tracking branch 'koolkrafter5/meteor-nei' into dev 2025-05-04 12:51:56 +02:00
Martin Robertz 364d97238f Merge remote-tracking branch 'koolkrafter5/item-refactor' into dev 2025-05-04 12:51:52 +02:00
Martin Robertz 287033fe8a Merge remote-tracking branch 'tiflu/master' into dev 2025-05-04 12:51:43 +02:00
Martin Robertz e75e9f778a update 1.7.15 2025-05-04 12:50:51 +02:00
koolkrafter5 deb0118a41 Merge branch 'master' into meteor-nei 2025-05-03 12:14:33 -04:00
koolkrafter5 7bc6d7bdef Merge branch 'master' into item-refactor 2025-05-01 14:01:12 -04:00
koolkrafter5 a6c282716b Merge branch 'master' into structurelib 2025-05-01 13:01:54 -04:00
FourIsTheNumber 6bd083125a Add config to disable potion flask repairability (#80) 2025-05-01 09:33:46 +02:00
koolkrafter5 95872c2080 Merge branch 'master' into structurelib 2025-05-01 00:47:54 -04:00
koolkrafter5 656ea1d065 Spotless 2025-05-01 00:34:45 -04:00
koolkrafter5 a5af28d48d Migrate StructureLib Blood Altar handler from StructureCompat. Fix it to work with the recent addition of having special blocks set to minecraft:air to work with any non-air block. 2025-05-01 00:28:18 -04:00
Martin Robertz 3695926a4b sa 2025-04-29 12:19:37 +02:00
tiflu 44dadfd139 Fixes missing texture particles when breaking or mining the Alchemic Calcinator. 2025-04-28 17:24:39 -05:00
tiflu 806d9aac1c Adds glass breaking sound to belljar, fixes missing texture particles when breaking, and allows the pickaxe to break the belljar quickly. 2025-04-28 17:23:41 -05:00
koolkrafter5 395e9c6b10 This works to make it only show this info on the first page of results, which seems fine. 2025-04-25 07:50:41 -04:00
koolkrafter5 3eeabd90ae Make this message more clear 2025-04-25 07:50:41 -04:00
koolkrafter5 2321967bdb Capitalize this to match other text 2025-04-25 07:50:41 -04:00
koolkrafter5 2b0b688c98 Spotless 2025-04-25 07:50:41 -04:00
koolkrafter5 b721e43537 Move the + button down for the meteor handler so it's not on top of the item slot graphics. 2025-04-25 07:50:41 -04:00
koolkrafter5 f74f42d0f9 Add ritual (name and cost) and reagent (message saying there are none that apply) to the binding ritual handler. It shows them for every recipe. It should only show once per page, but I'm stumped on how to actually do that. 2025-04-25 07:50:41 -04:00
koolkrafter5 b02fa2f32d Revamp the NEI meteor handler.
Add a new Ritual Info widget that shows the required activation crystal, ritual name, and activation cost when hovered. Suitable for use in any other NEI ritual handlers.
Move the cost and radius to the top of the page so they don't get hidden with certain UI scales.
Cost now shows the blood orb required (works with any IBloodOrb, but does not account for Runes of the Orb). The orb is darkened and the hover text includes "Insufficient LP" if the player does not have enough LP to summon that meteor.
Radius shows the diameter (and its formula because it's actually 2r + 1) when hovered.
Add a new Reagent Effects widget (also suitable for use in other handlers), and have it show effects for the currently selected meteor (meteors with no filler will not show things that impact filler, new filler chance will be calculated, new radius will be calculated).
Center focus item and arrow on the texture because they were not centered before.
2025-04-25 07:50:41 -04:00
Martin Robertz 09fbb5574b update 1.7.11 2025-04-25 13:43:04 +02:00
koolkrafter5 180c7c0f3e Merge branch 'master' into item-refactor 2025-04-25 06:21:16 -04:00
Guillaume Mercier 559e2439b2 Remove Profanity (#78) 2025-04-25 14:50:10 +08:00
koolkrafter5 caca7c5fc7 Merge branch 'master' into item-refactor 2025-04-20 16:20:38 -04:00
Martin Robertz ef17235ae5 update 1.7.9 2025-04-20 21:45:39 +02:00
koolkrafter5 efc0c52bc8 Spotless 2025-04-20 06:58:40 -04:00
koolkrafter5 fc589690d0 Replace fields for tickDelay and isBoundTool as well as the drain cost and bound tool right click cost with overridable methods. Removed parameters from various methods and made some static methods instance methods as a consequence.
Improved the check for valid sigils to put in the Sigil of Holding by using an overridable method instead of checking if it's a SigilOfHolding.
2025-04-20 06:58:06 -04:00
koolkrafter5 3e40aa9708 Revert change to settings.gradle 2025-04-20 03:23:14 -04:00
Maya 8da3db4e65 Merge branch 'master' into item-refactor 2025-04-19 09:40:28 -05:00
ABKQPOandMaya efe1e6044a Fix Mark of the Falling Tower does not check item stack and does not immediately remove entities (#75)
Co-authored-by: Maya <[email protected]>
2025-04-19 14:38:37 +00:00
koolkrafter5andMaya 14a4825e33 More comma-separation (#74)
Co-authored-by: Maya <[email protected]>
2025-04-19 14:31:10 +00:00
koolkrafter5 f5791ff631 Fix rituals not working when doDaylightCycle is set to false. (#72) 2025-04-19 09:28:39 -05:00
koolkrafter5 b0096a3279 Spotless 2025-04-10 18:19:01 -04:00
koolkrafter5 681fa92af5 Simplify these tooltip methods. 2025-04-10 16:56:59 -04:00
koolkrafter5 e153c70116 Simplify this method. 2025-04-10 16:44:54 -04:00
koolkrafter5 1ea6d9c700 Replace hardcoded values 2025-04-10 16:37:23 -04:00
koolkrafter5 38a7bbbe55 Replace checkAndSetItemOwner in SoulNetworkHandler with a wrapper for the new version in IBindable.
Spotless.
2025-04-10 16:24:42 -04:00
koolkrafter5 082b41cb8c Add these back as wrappers for the new methods to fix a problem with Blood Arsenal. 2025-04-10 16:18:31 -04:00
koolkrafter5 5a6c998070 Remove quotes from "Developer" username set in gradle.properties. 2025-04-10 15:36:07 -04:00
koolkrafter5 b14aded91f Replace a bunch of duplicated checks done for various items with methods in IBindable.
Replace a bunch of duplicated checks for toggling sigils in ISigil.
Move static methods from EnergyItems to IBindable so they are more relevant for the bound tools (they don't extend EnergyItems because they need to extend the tool classes).
2025-04-10 15:25:15 -04:00
koolkrafter5 46a8c566d7 Make the Energy Bazooka extend the Energy Blaster because the two items are very similar and shared a lot of code. 2025-04-10 03:14:18 -04:00
koolkrafter5 ac59510594 Update syntax 2025-04-10 01:24:42 -04:00
koolkrafter5 d5a33f6f81 Use getTotalWorldTime 2025-04-10 00:07:59 -04:00
koolkrafter5 aad613b221 Make a generic method in order to remove tons of duplicate code that adds an item's owner and its active state to the tooltip. 2025-04-09 23:44:17 -04:00
Maya ead07b752b Show LP comma-separated with divination sigil (#71) 1.7.8 2025-04-09 01:23:09 -05:00
Maya d821098d4e update 1.7.7 2025-04-08 23:43:52 -05:00
koolkrafter5andMaya 8762c24331 Ritual of Speed bugfix and cleanup (#70)
Co-authored-by: Maya <[email protected]>
2025-04-09 04:42:00 +00:00
koolkrafter5andMaya a1f62e0db6 NEI Meteor Oredict Support (#69)
Co-authored-by: Maya <[email protected]>
2025-04-08 19:57:01 +00:00