Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-29 18:28:34 +01:00
Code Issues Projects Releases Wiki Activity
3076 commits 14 branches 4 tags 33 MiB
Commit graph

2725 commits

Author SHA1 Message Date
Flanks255
36be4b9a9f Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-09 16:16:01 -06:00
Mrbysco
a65bd989d5 Remove unused imports 2024-03-09 23:14:52 +01:00
Mrbysco
a678b3e049 Remove unused classes that have replacements 
`DrillAugmentItem` `ActuallyItem` have been replaced by `ItemDrillUpgrade` and `ItemBase`
`IActuallyItem` was an empty interface never really used
 2024-03-09 23:14:34 +01:00
Flanks255
0632253a3b Added JEI plugin for canola press recipes. 2024-03-09 16:08:34 -06:00
Flanks255
7ae6231a38 Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-09 16:07:53 -06:00
Mrbysco
e8df077d70 Add missing Black Quartz block recipes 2024-03-09 22:59:45 +01:00
Mrbysco
1d581fc120 Add block/item tags for the crops/ores 2024-03-09 22:54:41 +01:00
Flanks255
713568d7e2 Fixed reconstructor crash 2024-03-09 15:35:28 -06:00
Flanks255
4876677161 Fixed item models. 2024-03-09 15:16:34 -06:00
Mrbysco
e6c8af19af Add crops to villages 2024-03-09 22:15:49 +01:00
Flanks255
3f356896b7 Greenhouse glass recipe. 2024-03-09 11:41:37 -06:00
Mrbysco
53414c434a Add recipe click area for coffee machine and Powered Furnace 2024-03-09 18:02:33 +01:00
Mrbysco
0a6aa6545b Fix shift-clicking empty cups into coffee machine 2024-03-09 17:55:57 +01:00
Mrbysco
fc20f4a94a Fix the Coffee Maker's tick behavior so it works 2024-03-09 17:51:33 +01:00
Mrbysco
09673dd118 Fix right clicking the coffee maker being wonky 2024-03-09 17:51:11 +01:00
Mrbysco
d4cc7b0737 Fix the coffee effect displaying wrong due to setting the ticksPerSecond to 20 instead of 1 2024-03-09 17:49:20 +01:00
Mrbysco
56402e46eb Fix the coffee effect storing 2024-03-09 17:48:42 +01:00
Mrbysco
ba64232ac1 Fix up FluidDisplay not using the tint color of a fluid 2024-03-09 17:04:07 +01:00
Mrbysco
53e4cb8a9b Change FluidDisplay to use the RenderSystem calls instead of GLStateManager where possible 2024-03-09 16:38:17 +01:00
Mrbysco
4a36c696ab Make getOverlayText return a Component in FluidDisplay 2024-03-09 16:36:47 +01:00
Mrbysco
83828a6def Re-enable the text rendering on the energy display 
Make getOverlayText return a Component instead of Component -> getString -> Component.literal
 2024-03-09 16:33:31 +01:00
Mrbysco
f1c7b2491e Change the overlay checked so overlays aren't rendered over the hotbar 2024-03-09 16:31:10 +01:00
Mrbysco
951355bf05 Remove YummyItem which is a unused class for the foods that are removed 
https://github.com/Ellpeck/ActuallyAdditions/blob/1.20.4/port.MD?plain=1#L25
 2024-03-09 16:05:39 +01:00
Mrbysco
f758e8beac Deprecate ActuallyItem and DrillAugmentItem 
They both have replacements and are unused
 2024-03-09 16:03:33 +01:00
Mrbysco
4b55999af3 Remove WIP from Powered Furnace name 2024-03-09 15:46:20 +01:00
Mrbysco
323c07568d Use the level and pos variable 2024-03-09 15:44:35 +01:00
Mrbysco
73f7af4dbf Fix the position of the auto split button in the Powered Furnace UI 2024-03-09 15:34:50 +01:00
Mrbysco
bbf42da613 Remove todo from Powered Furnace light level code (it works) 2024-03-09 15:16:38 +01:00
Mrbysco
817797ad3a Re-enable rendering of the GreenHouse glass and add culling 2024-03-09 02:33:07 +01:00
Flanks255
2fbf2984ab More tweaks. 2024-03-08 18:24:19 -06:00
Michael Hillcox
ecb8d46f50 fix: no more bad trace 2024-03-09 00:13:27 +00:00
Flanks255
d1438dd67e Fixed filling wand using wrong method. 2024-03-08 18:13:09 -06:00
Michael Hillcox
cf8e56ab2a fix: whoops 2024-03-09 00:07:17 +00:00
Michael Hillcox
d36cb9c76e fix: drill range 2024-03-09 00:06:58 +00:00
Flanks255
1183a169d8 Fiddle fiddle 2024-03-08 17:54:09 -06:00
Mrbysco
f8cc525237 Order the codec properly please ;) 2024-03-09 00:37:34 +01:00
Mrbysco
b261d92bcd Fix Liquid Fuel recipe codec 2024-03-09 00:34:53 +01:00
Mrbysco
f2596f974a Feed the blockpos when opening a menu 2024-03-09 00:23:20 +01:00
Mrbysco
82aaacf1d9 Make canPlayerUse consistently use this.getBlockPos() 2024-03-09 00:23:01 +01:00
Flanks255
06ef7146e0 Fixed recipes, removed some wip entries. 2024-03-08 17:08:14 -06:00
Mrbysco
231656eddb Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-09 00:04:00 +01:00
Mrbysco
ed8ea0e616 Override stack sensitive isCorrectToolForDrops so it's aware of the current power 2024-03-09 00:03:51 +01:00
Flanks255
908a57b5e1 Fixed AIOT sprites 2024-03-08 17:00:38 -06:00
Flanks255
a622e497b3 Removed recipes for things that dont work yet. 2024-03-08 16:52:25 -06:00
Flanks255
1e32301013 Fixed missing recipes. 
Fixed missing lang entries.
 2024-03-08 16:41:51 -06:00
Flanks255
c29830adc3 Added cooking rice dough to bread. 2024-03-08 16:11:40 -06:00
Flanks255
db5d718dd5 Some cleaning. 2024-03-08 15:40:48 -06:00
Mrbysco
051388570a Fix negative attack speed 2024-03-08 20:30:17 +01:00
Mrbysco
8b5b073850 Fix missing argument in translation key 2024-03-08 00:34:35 +01:00
Mrbysco
2ad699c61a Remove unused imports 2024-03-08 00:29:29 +01:00
Mrbysco
9ec20f4895 Actually use the particle event to register the particles 2024-03-08 00:29:17 +01:00
Mrbysco
fc7032fa4d Switch over from SmallerButton to vanilla's button 2024-03-08 00:21:39 +01:00
Flanks255
8f73813a45 More recipe stuff, crystal block compress/decompress recipes. 2024-03-06 19:30:59 -06:00
Mrbysco
91d9009f14 Update FermentingRecipe.java 2024-03-07 02:24:26 +01:00
Mrbysco
cf3ddec55b Update UpdateChecker.java 2024-03-07 02:08:17 +01:00
Mrbysco
0e30bd9974 Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-07 01:56:50 +01:00
Mrbysco
555b1ddffb Back to CustomEnergyStorage 2024-03-07 01:56:39 +01:00
Flanks255
fc101a90df Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-06 18:45:01 -06:00
Michael Hillcox
e22b1615a7 fix: incorrect config spam 2024-03-07 00:40:03 +00:00
Mrbysco
6da50dfa60 Fix drill gui title 2024-03-07 01:39:34 +01:00
Flanks255
2040c68ed6 Misc recipe stuff, removed some unused items. 2024-03-06 18:38:50 -06:00
Mrbysco
d9961a3926 Fix drill mistake 2024-03-07 01:35:53 +01:00
Michael Hillcox
4ef880aa15 feat: improved build tool setup 2024-03-07 00:24:42 +00:00
Mrbysco
3ce53350bf Generate item model for Crate Keeper using old texture 2024-03-07 00:42:39 +01:00
Mrbysco
c1ee118eda Fix batbox rendering 2024-03-07 00:35:55 +01:00
Mrbysco
24763a46bc Fix ItemEnergy 2024-03-07 00:18:32 +01:00
Flanks255
38f4824757 Sack finished i think? for now... 2024-03-06 12:59:34 -06:00
Mrbysco
e125e80e8c Deprecate SmallerButton 2024-03-06 00:47:10 +01:00
Mrbysco
9f0a9926ac Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-06 00:37:30 +01:00
Mrbysco
a85c67955c Fix Smaller Button not rendering using the color of the message 2024-03-06 00:37:24 +01:00
Flanks255
f9df9226bf Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-05 17:34:58 -06:00
Flanks255
edccaec7df Auto pickup fixed 2024-03-05 17:34:48 -06:00
Mrbysco
3f49a259a1 Fix item filter title 2024-03-06 00:13:01 +01:00
Mrbysco
7e0e86744c Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-06 00:10:50 +01:00
Mrbysco
7658fdaa4f Initial booklet setup 2024-03-06 00:10:49 +01:00
Flanks255
d704c4a4ba Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-05 17:03:03 -06:00
Flanks255
79c8bcfbd9 bysco plz help 2024-03-05 17:02:32 -06:00
Mrbysco
0c8b52a76f Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-05 23:29:35 +01:00
Mrbysco
822913f047 Make Bio Reactor direactional and generate the blockstate 2024-03-05 23:29:23 +01:00
Flanks255
ccadf11e57 Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-05 16:23:58 -06:00
Flanks255
85725a0f85 misc wip sack fixes. 2024-03-05 16:23:49 -06:00
Mrbysco
c585fc993b Remove a line of commented out code 2024-03-05 21:18:07 +01:00
Mrbysco
96992eb8cd Remove old coffee machine category classes 2024-03-05 21:17:48 +01:00
Mrbysco
971fdd652f Add Coffee Machine JEI category 
Create a recipe type replacement for CoffeeIngredient
 2024-03-05 21:14:05 +01:00
Mrbysco
2f50f5ecfc Move the JEI categories into folders 2024-03-05 17:36:42 +01:00
Mrbysco
bf4be2296a Add tooltip to Powered Furnace 2024-03-05 17:34:16 +01:00
Mrbysco
ca3f84efae Add the Powered Furnace as a catalyst for smelting recipes 2024-03-05 17:34:07 +01:00
Mrbysco
06de7536df Fix error in packet handler 2024-03-05 17:29:16 +01:00
Mrbysco
abbc1ae90c Make Black Quartz Ore drop the item directly unless silk touched 2024-03-05 17:11:22 +01:00
Mrbysco
97c7a96958 Adjust count to match vein size in AAWorldGen 2024-03-05 16:59:57 +01:00
Mrbysco
02422d6547 Generate Black Quartz 2024-03-05 16:58:45 +01:00
Mrbysco
899b2a982b No need to use setShaderTexture as blit does that already 2024-03-05 16:06:51 +01:00
Mrbysco
041381830f Fix Buttons rendering on mouse instead of at their position 2024-03-05 16:05:29 +01:00
Mrbysco
2cef8eb804 Fix double background being rendered in UI's 2024-03-05 16:04:21 +01:00
Mrbysco
87f753a1cc Fix the durability bar on charge-able items 2024-03-05 15:50:07 +01:00
Flanks255
350da9b2b0 Fixed hand not swinging when putting items in display stands / empowerers in creative mode. 2024-03-04 17:03:33 -06:00
Mrbysco
b33faa124f Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-04 23:44:28 +01:00
Mrbysco
99f670656c Register the Capabilities to the blockentities and items that have them 
Also change the DeferredItem's to return the class of the item
 2024-03-04 23:44:24 +01:00
Flanks255
8374a4d704 Laser fixes. 2024-03-04 16:33:15 -06:00
Mrbysco
f9897f0664 Fix ClientRegistryHandler being registered under the wrong bus 2024-03-04 22:55:09 +01:00
Mrbysco
dcc2220a28 Run datagen 2024-03-04 22:52:17 +01:00
Mrbysco
02a6918267 Update CrushingRecipe.java 2024-03-04 22:52:10 +01:00
Mrbysco
50407e9524 Fix advancement gen 2024-03-04 22:50:27 +01:00
Mrbysco
ead1d9be58 Fix bucket model generation 2024-03-04 22:42:35 +01:00
Mrbysco
4a16be41c9 Don't register DungeonLoot to the event bus 2024-03-04 22:42:23 +01:00
Mrbysco
d49d29b7e9 Trailing comma 2024-03-04 22:39:16 +01:00
Mrbysco
74688b9596 Remove unused imports 2024-03-04 22:38:59 +01:00
Flanks255
32d4b5a052 more fixes, it compiles 2024-03-04 15:37:11 -06:00
Flanks255
0b4c9838e9 Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-04 15:03:54 -06:00
Flanks255
610bf044ee More Recipe fixes. 2024-03-04 15:03:46 -06:00
Mrbysco
5ac94e8fe4 Fix WorldData getter 2024-03-04 21:59:11 +01:00
Mrbysco
056ec5c1e0 Fix canola press container 2024-03-04 21:58:59 +01:00
Mrbysco
06bb77b7dd Update BlockGreenhouseGlass.java 2024-03-04 21:57:36 +01:00
Mrbysco
b6d1fafa24 Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-04 21:54:17 +01:00
Mrbysco
f3efa570a4 Update TexturedButton.java 2024-03-04 21:54:00 +01:00
Flanks255
c866a404ea Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-04 14:50:46 -06:00
Flanks255
576d463441 Recipe Stuffs 2024-03-04 14:50:33 -06:00
Mrbysco
c2bcbfe56f Rest of the tiles done 2024-03-04 21:38:02 +01:00
Flanks255
ebaae73dad Adding my util classes 2024-03-04 13:38:11 -06:00
Flanks255
00418d267f Small filter tweak 2024-03-04 13:36:26 -06:00
Mrbysco
63fbbb334e Unfinished port to 1.20.4 Neo 2024-03-04 20:21:48 +01:00
Mrbysco
8236527fb7 Tiny Torch 2024-03-03 20:52:31 +01:00
Mrbysco
c960149ca5 Rename invalid texture names 2024-03-03 19:02:53 +01:00
Mrbysco
f8c2f53b6a Re-add JEI support 2024-03-03 19:02:05 +01:00
Mrbysco
7af0f214f0 Add localization for the fluid types 2024-03-03 19:01:51 +01:00
Mrbysco
3a48ccdcb3 Move the fluid textures so that Minecraft picks them up 2024-03-03 19:01:42 +01:00
Mrbysco
3586ce0ade Remove commented out reference to blockstate and itemmodel generation since we have that 2024-03-03 19:00:03 +01:00
Mrbysco
4596da2df5 Move the RecipeType DeferredRegister 2024-03-03 17:52:22 +01:00
Mrbysco
80fb2273b5 Datagen the DamageType 2024-03-03 17:49:29 +01:00
Mrbysco
4384c932f9 Deferred register the RecipeTypes 2024-03-03 17:48:28 +01:00
Mrbysco
6133488eee Port to 1.20.1 2024-03-03 01:20:53 +01:00
Mrbysco
7c2e42dfcf Port to 1.18 2024-03-02 21:23:08 +01:00
Flanks255
3edef49c04 Some sack fixes, other misc things. 2023-12-20 15:02:25 -06:00
Mrbysco
acef152961 Generate advancements 
Still not all, but not sure all of them are still relevant
 2023-12-03 15:41:58 +01:00
Flanks255
40f48f0e6c More Cleanup. 2023-12-02 07:49:10 -06:00
Flanks255
d4af87ceb3 Misc fixes 2023-11-26 16:10:19 -06:00
Flanks255
1fb8b80ee4 Cleaning up worms some more. 2023-05-15 19:23:26 -05:00
Flanks255
097803020c Fixed worms. 2023-05-12 21:20:26 -05:00
Flanks255
a75848e195 First pass at the sack, still wip. 2023-03-15 18:17:57 -05:00
Flanks255
0e1217b5d3 Fixed laser relays placement logic. 2023-01-19 14:45:14 -06:00
Mrbysco
32008f113c Relays. 2023-01-19 16:27:56 +01:00
Flanks255
07a6da0948 🐌 2023-01-16 15:47:31 -06:00
Flanks255
e2fb8b12a9 fixed the worm. 2023-01-15 17:47:13 -06:00
Flanks255
72e29bf696 bysco fixes, no more worm errors... 2023-01-15 16:42:43 -06:00
Flanks255
db9b199d76 Updated Forge. 
Updated JEI.
Fixed some log spam.
 2023-01-15 15:46:42 -06:00
Flanks255
860215e7c1 Battery box stuff. 2023-01-15 11:14:29 -06:00
Flanks255
44effd2e7a Coffee fixes. 
Batbox stuff.
 2023-01-15 10:56:02 -06:00
Flanks255
6263e819ab Goggles. 2023-01-14 17:26:59 -06:00
Flanks255
a03036e9db Goggles. 2023-01-14 17:26:37 -06:00
Flanks255
8dd0e1a951 Leaf blowers are done. 2023-01-14 16:02:33 -06:00
Flanks255
750d2649c8 More missing recipes and lang entries. 2023-01-08 17:35:39 -06:00
Flanks255
44ab9291e7 Recipes and lang stuff... 2023-01-07 14:54:54 -06:00
Flanks255
d62d833178 Empowerer Plugin 2022-12-30 19:06:33 -06:00
Flanks255
177370a6a5 JEI Laser plugin. 2022-12-30 18:24:21 -06:00
Flanks255
90b1675764 more recipes. 2022-12-30 16:37:16 -06:00
Flanks255
215cd50608 some crafting recipes. 2022-12-29 18:02:38 -06:00
Michael Hillcox
9d6415e2f8 feat: added (wip) to all non-complete items 2022-11-06 21:17:56 +00:00
Flanks255
86a89a96a8 first pass at functional crusher. 2022-10-19 13:04:42 -05:00
Flanks255
04714de062 fixed furnace for now. 2022-10-19 12:15:46 -05:00
Flanks255
120721564e Crushers and furnaces keep energy. 
Fixed crusher crash.
 2022-10-19 09:57:56 -05:00
Flanks255
e8fee61c91 More tiles storing energy... 2022-10-14 18:58:04 -05:00
Flanks255
ffb11ca5f3 Helper for later block entities loot tables. 2022-10-12 19:13:18 -05:00
Flanks255
6825fa3d4a Atomic Reconstructor fixes, saves energy when mined, also saves redstone mode, and restores on placement, more to come. 2022-10-12 17:49:01 -05:00
Flanks255
c15fbab60b Implemented Reconstructor random tooltips 2022-10-08 12:26:24 -05:00
Flanks255
773d723ce0 more laser things. 2022-09-01 18:26:54 -05:00
Flanks255
c6f226c2da mining lens part 2. 2022-08-31 12:07:18 -05:00
Flanks255
7251e3390c Go go mining lens recipes, part 1. 2022-08-30 17:20:32 -05:00
Flanks255
a7ea216a03 no more freezing. 2022-08-29 17:18:31 -05:00
Flanks255
648ff8b771 Laser length... lol 2022-08-26 16:19:21 -05:00
Flanks255
0965c430c3 Misc 2022-08-26 08:09:34 -05:00
Flanks255
904c408c94 Color lens time. 2022-08-17 10:29:31 -05:00
Flanks255
8d62396155 Color changing, part 3 2022-08-10 17:33:07 -05:00
Flanks255
9f1e664c08 Color changing, part 2 2022-08-10 17:11:09 -05:00
Flanks255
f5f154b898 Color changing, round 1. 2022-08-03 16:48:00 -05:00
Flanks255
48a2734161 nothing to see here... 2022-07-27 13:34:00 -05:00
Flanks255
011834c732 Colorful lasers 2022-07-27 13:06:26 -05:00
Flanks255
70b0131f88 goodbye arrays of float arrays... 2022-07-06 12:14:19 -05:00
Flanks255
26dfa7cb75 More cleaning and yeeting. 2022-06-24 14:38:07 -05:00
Flanks255
2538de7a4f More lens fixes. 2022-06-24 14:23:43 -05:00
Flanks255
ec8cb4888c now lasers work up and down, whoops. 2022-06-22 17:14:11 -05:00
Flanks255
59785c4d1c more cleaning. 2022-06-18 10:53:23 -05:00
Flanks255
87b1e12892 energy things... 2022-06-12 17:13:33 -05:00
Flanks255
768b677e41 even moar refactoring. 2022-06-05 16:02:36 -05:00
Flanks255
35bf265618 moar refactoring. 2022-06-05 15:36:27 -05:00
Flanks255
123b5b1810 some cleaning, refactoring, and starting work on the coffee machine. 2022-06-05 15:30:25 -05:00
Flanks255
ab672f6474 Moved sounds to deferred. 
Moved sounds to datagen.
Fixed sounds in the reconstructor.
 2022-05-18 15:39:49 -05:00
Flanks255
21a57f2ac9 yeet 2022-04-24 14:54:46 -05:00
Flanks255
a8ab7e8ed8 Lots of fixes, lang fixes, recipe fixes, etc 2022-04-23 12:49:25 -05:00
Flanks255
e8e57ec14e More Yeeting 2022-04-20 12:06:54 -05:00
Flanks255
f420f6e63d things 2022-04-11 16:50:35 -05:00
Flanks255
ab58e7344c Yeet 2022-04-11 16:10:47 -05:00
Flanks255
e0c2bfe9c4 Removed disruption lens. 
added Ell's checklist.
 2022-04-11 15:49:01 -05:00
Flanks255
f6797386fa (Sad FE Noises) 2022-04-11 15:40:47 -05:00
Flanks255
660e976a1f 1st pass at the fluid placer and collector. 2022-04-09 13:11:27 -05:00
Flanks255
ce972eb1f3 breaker breaks. 2022-04-03 19:12:40 -05:00
Flanks255
30e8137c04 placer works... the breaker tho... 2022-04-03 15:18:46 -05:00
Flanks255
327fdc5c3b Drop it like its hot... ill show myself out thank you... 2022-04-03 13:36:07 -05:00
Flanks255
9bb1105c7c more oil generator work. 2022-04-02 16:56:22 -05:00
Flanks255
538d77c831 something something oil generator >_> 2022-04-02 16:41:52 -05:00
Flanks255
ff27e16bc1 Typo in crystallized. 
Phase 1 working to oil generator.
 2022-04-01 21:50:39 -05:00