Commit graph

2864 commits

Author SHA1 Message Date
Mrbysco
d8ad92c447 Fix Empowered Emeradic Crystal requiring tall grass (Fixes #1410) 2024-10-17 18:39:43 +02:00
Mrbysco
a6a9467dd1 Fix Tiny Toch placement (Fixes #1409) 2024-10-17 18:35:11 +02:00
Mrbysco
0e3a961257 Re-enable Patchouli support 2024-10-17 00:54:39 +02:00
Mrbysco
82c99e0b56 Update compat mining lens recipes 2024-10-17 00:19:23 +02:00
Mrbysco
3e5561bfb3 Remove unused classes related to removed Smiley Cloud 2024-10-16 23:44:58 +02:00
Mrbysco
b0491d0a3d Remove laser particle todo 2024-10-16 23:41:20 +02:00
Mrbysco
7ad55e116b Remove code relating to removed Treasure Chest 2024-10-16 23:38:21 +02:00
Mrbysco
f40023cfd2 Change tile inventory saving/loading
Using the serializeNBT and deserializeNBT methods from ItemStackHandler
2024-10-16 23:37:31 +02:00
Mrbysco
a117dd5340 Fix placer not working 2024-10-16 23:29:06 +02:00
Mrbysco
8e06e4bcb0 Remove removed Smiley Cloud tile entity class 2024-10-16 23:10:41 +02:00
Mrbysco
b4521321c8 Remove empty lines between Override and method 2024-10-16 23:10:13 +02:00
Mrbysco
8cdd5acaaf Remove old TODO from TileEntityLaserRelayEnergy 2024-10-16 23:09:53 +02:00
Mrbysco
845aaf847d Remove todo in TileEntityLaserRelay 2024-10-16 23:06:56 +02:00
Mrbysco
0d525dea6c Remove TileEntity related to removed Compost 2024-10-16 23:06:48 +02:00
Mrbysco
3d5a99414f Remove old TileEntityBase TODO's
Remove unused method
2024-10-16 22:50:31 +02:00
Mrbysco
d112602764 Remove unused imports 2024-10-16 22:42:55 +02:00
Mrbysco
deadb3fd70 Make ActuallyContainers consistent
It now matches the rest of the registration related classes
2024-10-16 22:41:57 +02:00
Mrbysco
84c7b0d61a Move Entity registration code to InitEntities
Move BiomeModifier and Condition registration code to ActuallyBiomeModifiers
2024-10-16 22:40:19 +02:00
Mrbysco
09592c6f41 Resolve TODO on Crystal Cluster loottable 2024-10-16 22:26:33 +02:00
Mrbysco
005b3ccc8a Remove Black Quartz Ore loot TEMP 2024-10-16 22:12:30 +02:00
Mrbysco
072f5c68b7 Remove TODO on Ring of Growth recipe
Since it works
2024-10-16 22:08:29 +02:00
Mrbysco
863c2b758b Remove TODO as the content in question was removed 2024-10-16 22:02:28 +02:00
Mrbysco
09fa51e7d4 Remove unused imports 2024-10-15 22:07:23 +02:00
Mrbysco
92dfcb472c Fix drill behavior 2024-10-15 22:07:14 +02:00
Mrbysco
556f4a773c Run datagen 2024-08-11 20:37:49 +02:00
Mrbysco
93242df1ff Add cutout to all crop models instead of ignoring the first state 2024-08-11 20:37:33 +02:00
Mrbysco
b70c791666 Fix lookup mistake in recipe generator 2024-08-11 20:37:10 +02:00
Mrbysco
e81c6c4744 Rename mods.toml 2024-08-11 20:36:56 +02:00
Mrbysco
a831cbbda7 Hook up built-in config screen
TODO: Datagen lang keys
2024-08-11 20:36:49 +02:00
Mrbysco
a20c25eb4a Encase the PatchouliPages init into a isLoaded check
Allows for testing without Patchouli
2024-08-11 20:36:25 +02:00
Mrbysco
3262554139 Move onBlockStartBreak into BlockEvent.BreakEvent event 2024-08-11 20:35:56 +02:00
Mrbysco
bb84d53906 Fixed wrong Codec / StreamCodec being used for Crushing recipe 2024-08-11 20:33:08 +02:00
Mrbysco
c5e264f685 Fix the key creation for Configured/Placed features 2024-08-11 20:32:45 +02:00
Mrbysco
902b27914d Actually register the capabilities to the items and feed the transfer rate 2024-08-11 20:32:27 +02:00
Mrbysco
ca68c2703a More things 2024-08-11 20:31:47 +02:00
Flanks255
0c493b9169 Things 2024-07-27 17:51:54 -05:00
Flanks255
d0b7e95ed5 Just filler things lol. 2024-07-27 17:30:21 -05:00
Flanks255
2e394d9230 Some more things.... 2024-07-27 15:52:49 -05:00
Flanks255
f28b6714d4 Some more things... 2024-07-27 15:43:46 -05:00
Flanks255
ff222b6e69 Some things... 2024-07-25 18:43:15 -05:00
Flanks255
8cc262156e more things. 2024-07-24 17:22:57 -05:00
Flanks255
adce5984e4 Sack things, moved filter to WSD. 2024-07-24 16:38:54 -05:00
Mrbysco
856e07a521 More porting 2024-07-24 21:16:44 +02:00
Flanks255
49ccc20622 more things. 2024-07-23 17:51:57 -05:00
Flanks255
f4fa79d8cc even more brr... 2024-07-23 16:24:24 -05:00
Flanks255
cbf7135fbd more brr... 2024-07-22 19:06:26 -05:00
Flanks255
98ef8e8332 Something something porting go brr... 2024-07-22 18:42:48 -05:00
Flanks255
ac320235a2 Go Go Deferred Register... 2024-07-22 16:22:30 -05:00
Mrbysco
23815b70b3 Initial port to 1.21 (WIP) 2024-07-08 13:17:57 +02:00
Flanks255
0ebbd811fd Fixed drill attributes going haywire.
Bumped for release.
2024-06-27 16:59:03 -05:00
Flanks255
9b6dd7d030 yoinked cullfaces from the hopping item interface, Fixes #1401 2024-06-12 08:54:19 -05:00
Flanks255
7c91da5a02 Added crushing recipes for Copper / Deepslate copper / deepslate iron.
Fixed #1405
2024-06-11 21:55:44 -05:00
Flanks255
e408eb9465 Fixed #1402 2024-06-11 21:55:11 -05:00
Flanks255
f58948e7ce Fixed #1403 2024-06-11 21:54:51 -05:00
Flanks255
90f8063c75 Updated specialPeopleStuff.properties 2024-06-10 15:27:35 -05:00
Flanks255
9d76fad754 some clean up. 2024-06-10 15:10:09 -05:00
Flanks255
2bea730276 More Voxel simplifications.
Version Bump.
2024-06-05 08:51:46 -05:00
Flanks255
6686f1f417 Simplifying alot of block voxelshapes. 2024-06-04 22:25:30 -05:00
Flanks255
c812512abe Fixed up the teleport staff. 2024-06-04 16:38:19 -05:00
Flanks255
2cadd9e19a Fixed booster shape. 2024-06-04 15:18:55 -05:00
Flanks255
bc5dc44864 Gui Fixes 2024-06-04 15:16:17 -05:00
Flanks255
d7de3e61d2 Gui Fixes 2024-06-04 13:44:31 -05:00
Flanks255
9e0ce03580 Fixes 2024-06-04 13:36:41 -05:00
Flanks255
4d3ba552eb Fixed AIOT tilling and flattening. 2024-06-03 16:43:45 -05:00
Flanks255
a6f50e2f3a Fixed worm stuff. 2024-06-03 16:16:57 -05:00
Flanks255
a841121dde Fixed animation on stands. 2024-06-02 17:54:50 -05:00
Flanks255
fbdfc2e845 Fixed missing texture on fireworks box 2024-06-02 17:51:19 -05:00
Flanks255
5ce4f9a73c Fixing redstone things 2024-06-02 17:40:08 -05:00
Flanks255
99e166337b Fixed relay things.
Fixed compass clicking.
2024-06-01 14:51:54 -05:00
Flanks255
cf0349b102 Just lang things 2024-06-01 13:22:02 -05:00
Flanks255
eb7963631f Fiddling with laser relay rendering. 2024-06-01 12:55:29 -05:00
Flanks255
9000eb3fab Something something filter. 2024-05-30 17:13:21 -05:00
Flanks255
66e6123a5f changed wording. 2024-05-30 17:05:14 -05:00
Flanks255
5f3326af64 Changed wip to WIP 2024-05-30 17:02:52 -05:00
Flanks255
6389668bf9 ReAdding Damage Filtering, and NBT filtering. 2024-05-30 17:02:24 -05:00
Mrbysco
764ded5855 Add some todo's 2024-05-25 17:01:33 +02:00
Mrbysco
a5172ea2e3 Use the non-deprecated getBurnTime method 2024-05-25 16:49:37 +02:00
Mrbysco
60703b3004 Update NeoForge support (Fix #1400) 2024-05-25 16:49:21 +02:00
Flanks255
ccfb8d162d Fixed Phantom Placer / Breaker.
Removed some Wips.
Bump for FC
2024-04-28 16:46:39 -05:00
Mrbysco
9bd1fa63ea Reduce drill placement code size 2024-04-28 22:12:22 +02:00
Mrbysco
846172e69c Update DrillItem.java 2024-04-28 22:08:12 +02:00
Mrbysco
7e7fd0d8e2 Fix the block placing drill upgrade 2024-04-28 22:07:31 +02:00
Flanks255
786d9d3302 starting some skeleton of the crate. 2024-04-27 09:46:57 -05:00
Flanks255
19afc5f05c Fixed up datagen. 2024-04-09 17:30:53 -05:00
Mrbysco
4aeb9bd34f
Merge pull request #1396 from Ridanisaurus/1.20.4
Retexture 2.1
2024-04-05 18:55:41 +02:00
Ridanis
6542628228 Retextures 2.1 2024-04-04 09:08:52 +02:00
Mrbysco
d95442957e
Merge pull request #1395 from Ridanisaurus/1.20.4
Retextures 2.0
2024-04-03 21:56:17 +02:00
Ridanis
d136820b38 Updated Drill textures 2024-04-03 20:07:13 +02:00
Ridanis
f8fa256b24 Updated Battery textures 2024-04-03 18:56:59 +02:00
Ridanis
9d83857dd9 More clean up + updated textures 2024-04-03 18:30:55 +02:00
Ridanis
6bd17fd1ec Snail texture update 2024-04-03 14:17:07 +02:00
Ridanis
a60d11dde0 Lenses + Snail 2024-04-03 13:49:15 +02:00
Ridanis
4721f5128d VoxelShapes + Worm 2024-04-03 12:37:28 +02:00
Ridanis
c0dfed8fa3 Crops 2024-04-03 10:48:40 +02:00
Flanks255
6f56772560 Added Item Tag, to filter by a item tag. 2024-04-02 18:46:52 -05:00
Ridanis
79b2084ea5 Added item_tag texture for Flanks 2024-04-03 01:42:52 +02:00
Ridanis
9cf9601eaa Retexture 2.0 2024-04-03 01:06:40 +02:00
Mrbysco
52b5765a41 Sounds should be mono :) 2024-03-22 01:59:02 +01:00
Flanks255
bfaf90b42c Fixed position of furnace auto split button.
Fixed rendering of Furnace and Crusher auto split tooltips.
2024-03-16 17:25:03 -05:00
Flanks255
d9cae5b5f3 ACTUALLY added copper... 2024-03-16 13:08:38 -05:00
Flanks255
6005bee8d2 Added Copper ores to mining lens.
Added Xycraft ores to mining lens.
2024-03-16 12:37:17 -05:00
Flanks255
87601c1e6e Fixed removing filters from filterable inventories.
Added the void sack recipe.
Fixed the void sack.
2024-03-16 12:25:35 -05:00
Flanks255
44e055499e Try to fix player interface capability invalidation. 2024-03-15 17:30:51 -05:00
Mrbysco
58034533f9 Remove todo from InitVillager since the Engineer villager is back already 2024-03-15 21:17:55 +01:00
Mrbysco
a22ab366b1 Remove initIngredients method since it's been replaced already 2024-03-15 21:06:55 +01:00
Mrbysco
56322ebcc0 Add TODO for coffee saturation 2024-03-15 02:47:12 +01:00
Mrbysco
c2b2cc4d17 Empty the cup 2024-03-15 02:40:07 +01:00
Mrbysco
3b180faf60 Add missing Rotate and Mirror methods to DirectionalBlock 2024-03-14 23:13:11 +01:00
Flanks255
87b0261720 Enabled Handheld filler recipe
Bumped for FC
2024-03-14 17:03:44 -05:00
Flanks255
39b20107c4 removed more wips 2024-03-14 16:43:18 -05:00
Flanks255
482fc7acf6 Added some deepslate ores to the lens. 2024-03-14 16:41:45 -05:00
Flanks255
615d1a253e Removed wip from mote items. 2024-03-14 14:53:13 -05:00
Mrbysco
1207a27dbc More patchouli work 2024-03-14 01:53:37 +01:00
Mrbysco
90a923bd08 Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-14 00:29:18 +01:00
Mrbysco
ac4d53bde4 Update ItemGrowthRing.java 2024-03-14 00:29:10 +01:00
Flanks255
cad57217d4 Fixed recipe for player interface. 2024-03-13 18:06:38 -05:00
Flanks255
f0184f4d1a Added charged versions of all Energy items to JEI 2024-03-13 17:42:12 -05:00
Flanks255
99ea93ebad Added attachment copying to RecipeKeepDataShaped 2024-03-13 17:05:00 -05:00
Flanks255
911356adbc Fixed mekanism fluorite mining lens entry. 2024-03-13 16:59:01 -05:00
Flanks255
da7de46cdc Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-13 16:56:41 -05:00
Flanks255
e0a8eed365 Added RecipeKeepDataShapeless
Added drill coloring recipes.
2024-03-13 16:56:22 -05:00
Mrbysco
d2d0afa6d7 Fix the contain checks on the Player Probe and Player Interface 2024-03-13 22:35:43 +01:00
Flanks255
e4e9108099 Merge remote-tracking branch 'origin/1.20.4' into 1.20.4
# Conflicts:
#	src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246
2024-03-13 15:32:37 -05:00
Flanks255
cf80d1746e Readded rice paper recipe. 2024-03-13 15:32:15 -05:00
Mrbysco
659779b110 Banner patterns 2024-03-13 16:50:01 +01:00
Mrbysco
154add17bd Remove (wip) from drill core 2024-03-13 03:39:01 +01:00
Mrbysco
b94353019c Setup loot modifiers (Numbers need tweaking) 2024-03-13 03:38:20 +01:00
Mrbysco
f390ffd47f Add drill highlighting 2024-03-13 01:50:37 +01:00
Mrbysco
5a1eabeac4 Fix hopping item interface 2024-03-13 01:02:49 +01:00
Mrbysco
26758cb41b Update TileEntityBase.java 2024-03-13 00:30:34 +01:00
Mrbysco
bd392b0a5b Add back directionality to the hopping item interface 2024-03-13 00:28:41 +01:00
Flanks255
b8e284d947 Bandaid on hopping item interface.
Fixed phantomface capability invalidation.
2024-03-12 17:43:16 -05:00
Flanks255
f471f4f1fa Added Ancient debris to mining lens. 2024-03-12 17:15:56 -05:00
Mrbysco
f76db7ba65 Remove unused imports 2024-03-12 22:51:28 +01:00
Mrbysco
d64b530f8d Last I18n replacement 2024-03-12 22:39:01 +01:00
Mrbysco
b866f50e8f Add Mining Lens category 2024-03-12 22:21:17 +01:00
Mrbysco
87b4e29534 Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-12 21:31:32 +01:00
Mrbysco
3a767e1894 Replace more calls to I18n with Component.translatable
Fix up the Relay item Whitelist GUI
2024-03-12 21:31:29 +01:00
Flanks255
e1cd1b42ad Added mining lens recipe for Black Quartz ore
Added mining lens recipes for some other mods ores.
2024-03-12 14:57:44 -05:00
Mrbysco
d1ceffcac9 Update BlockLaserRelay.java 2024-03-12 20:37:25 +01:00
Mrbysco
0226078aee Use Components for the Laser Relays instead of String using I18n 2024-03-12 20:37:07 +01:00
Mrbysco
08b4f923f2 Use ITEM_WITH_COUNT_CODEC where possible 2024-03-12 20:09:08 +01:00
Flanks255
d1f77f3df2 Added smelting and blasting recipes for Black Quartz Ore 2024-03-12 13:22:30 -05:00
Mrbysco
337fbfb854 Remove renderLaser call from ReconstructorRenderer
It's handled by the particle
2024-03-12 18:49:18 +01:00
Mrbysco
58b9cbc9d2 Adjust the laser particle 2024-03-12 18:48:51 +01:00
Mrbysco
c995908d51 Fix the reconstructor death messages 2024-03-12 18:31:30 +01:00
Mrbysco
f5e3736299 Remove WIP from Shock Absorber 2024-03-12 18:21:12 +01:00
Mrbysco
5a921e100f Change Phantom Itemface recipe 2024-03-12 18:00:31 +01:00
Mrbysco
17d8dcce82 Long Range Breaker and Vertical Digger 2024-03-12 18:00:23 +01:00
Mrbysco
8419cc67aa Add Heat Collector recipe and remove (wip) 2024-03-12 17:12:20 +01:00