Port to 1.20.4 Neoforge #584

SirEndii · 2024-04-15T16:08:59Z

The initial port to 1.20.4 neoforge. The pr still needs a lot of work, considering the rewrites of some systems from neoforge.

Things that I need to address:

… the handling of external fluid and item storage. This includes the capability to get the total, used, and available external storage for both fluid and item elements.

…tion we need out of the item tag. Add a `usedBytes` and `totalBytes` field to the drive's object

…ingTasks`

… mod. Also add Jade for better testing purposes.

Add Dimensional Storage mod integration

# Conflicts: # build.gradle # src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 # src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e # src/generated/resources/.cache/b8526e444ae7356037f3a813274f6835d1f3dd16 # src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 # src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 # src/generated/resources/data/advancedperipherals/loot_tables/blocks/gas_detector.json # src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json # src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java # src/main/java/de/srendi/advancedperipherals/common/data/BlockStatesAndModelsProvider.java # src/main/java/de/srendi/advancedperipherals/common/data/EnUsLanguageProvider.java # src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java # src/main/java/de/srendi/advancedperipherals/common/setup/BlockEntityTypes.java # src/main/java/de/srendi/advancedperipherals/common/setup/Blocks.java # src/main/java/de/srendi/advancedperipherals/common/setup/Items.java # src/main/java/de/srendi/advancedperipherals/network/APNetworking.java

# Conflicts: # build.gradle # gradle.properties # src/main/java/de/srendi/advancedperipherals/common/addons/minecolonies/MineColonies.java # src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java # src/main/java/de/srendi/advancedperipherals/network/APNetworking.java # src/main/resources/data/curios/tags/items/glasses.json

This is currently not server side safe and does only work in single player

… Fixed hotkey module not working on servers

…ed `glassesKeyPressed` event

Add a `onUnequipped` function to the IModule interface Switch to a slot based module system to better track module changes

# Conflicts: # build.gradle # src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java # src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/EnergyDetectorEntity.java

zyxkad · 2024-12-23T21:42:42Z

wow you did such heavy work 👍
I may complete the review in the week

settings.gradle

src/generated/resources/data/advancedperipherals/recipes/weak_automata_core.json

src/main/java/de/srendi/advancedperipherals/client/ClientUUIDCache.java

zyxkad · 2024-12-24T03:58:53Z

...ancedperipherals/common/addons/computercraft/integrations/IntegrationPeripheralProvider.java


 import java.util.Comparator;
 import java.util.Optional;
 import java.util.PriorityQueue;
 import java.util.function.Function;
 import java.util.function.Predicate;

-public class IntegrationPeripheralProvider implements IPeripheralProvider {
+public class IntegrationPeripheralProvider {

    private static final String[] SUPPORTED_MODS = new String[]{"powah", "create", "mekanism", "botania"};


Actually are we able to use explicit class path instead of string concat lazy load here?

Propably. But the integrations are still broken, since I am not sure what the new alternative for peripheral providers are in CC. I also didn't try to fix this yet since we don't have any addon mod that supports 1.20.4

Well except for the two mekanism radiation functions

...va/de/srendi/advancedperipherals/common/addons/computercraft/operations/SingleOperation.java

...a/de/srendi/advancedperipherals/common/addons/computercraft/owner/TileEntityFuelAbility.java

...vancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataChargingPlugin.java

src/main/java/de/srendi/advancedperipherals/common/blocks/base/PeripheralBlockEntity.java

...n/java/de/srendi/advancedperipherals/common/blocks/blockentities/InventoryManagerEntity.java

…e level again

Use null for the SidedInvWrapper's side

SirEndii · 2024-12-24T15:58:48Z

So the two things I need to look at are the recipes and maybe the integrations

src/main/java/de/srendi/advancedperipherals/common/items/MemoryCardItem.java

src/main/java/de/srendi/advancedperipherals/common/setup/BlockEntityTypes.java

src/main/java/de/srendi/advancedperipherals/common/util/fakeplayer/APFakePlayer.java

Co-authored-by: Kevin Z <[email protected]> Signed-off-by: Srendi <[email protected]>

…nce and remove deprecated function

…ead of "unknown"

…bt ingredient

SirEndii · 2024-12-26T21:17:51Z

@zyxkad everything works now except for the integration stuff, which I don't really see critical because we don't have any integrations for 1.20.4 anyway.
If you agree and if you can't find anything else for a review, I would merge and publish this build

src/main/java/de/srendi/advancedperipherals/common/util/ChunkManager.java

.gitignore

…nt branches

…od bus

SirEndii and others added 30 commits December 21, 2023 01:51

Improve and extend the functionality of the ME Bridge by implementing…

1154d8a

… the handling of external fluid and item storage. This includes the capability to get the total, used, and available external storage for both fluid and item elements.

Implement mekanism chemical integration to the ME Bridge

c5eccc7

Some cleanup

8e30dd6

[#539] Remove the external storage counters from the internal functions

1f9d5da

Add Drives and Cells support to the ME Bridge

5bfe290

use the BasicCellInventory class instead of trying to get the informa…

ab7cdd8

…tion we need out of the item tag. Add a `usedBytes` and `totalBytes` field to the drive's object

[#51] Start an implementation for getCraftingTasks and `cancelCraft…

a36cbad

…ingTasks`

Set lua function to use the main tread.

ff2c69e

Add peripheral functions for the Dim Chest of the Dimensional Storage…

e031f32

… mod. Also add Jade for better testing purposes.

Merge pull request #550 from Einhornyordle/dev/0.8

f2ff1ec

Add Dimensional Storage mod integration

Implement prototype of cancelCraftingTasks to the ME Bridge

491b3da

Merge remote-tracking branch 'origin/dev/0.8' into dev/0.8

b5d3af8

[#13] Add a hotkey module

ca99ea2

This is currently not server side safe and does only work in single player

[AP-Features-13](IntelligenceModding/Advanced-Peripherals-Features#13)…

596200c

… Fixed hotkey module not working on servers

Fixed the smart glasses ui when playing on servers

285695d

Merge branch 'refs/heads/dev/1.19.2' into dev/0.8

4fd1953

Add the ability for the modules to inventory tick and fix double queu…

a1b7f53

…ed `glassesKeyPressed` event

!

44165e2

Add a night vision module to the smart glasses

a3ebf19

Add a `onUnequipped` function to the IModule interface Switch to a slot based module system to better track module changes

Adapt me functions to the internal api changes

d6cacfc

Satisfy checkstyle

26af8c8

start to fix chunky peripheral

dd5ee5d

setLoadedChunk when chunky peripheral is attaching

8abc3b9

fix some mistakes

a0a6bec

fix radius will not update if config changed from big to small

b3e55bb

fix argument name

ffa998d

fix styles

3fe2f36

zyxkad requested changes Dec 24, 2024

View reviewed changes

SirEndii added 9 commits December 24, 2024 16:42

Re-Add content filter for neoforged repository

7cd7185

Return null for ClientUUIDCache.getUsername instead

5d8fb44

Set minimum for cooldown operations to 0

75b3526

Reuse the energy storage variable instead of trying to get it from th…

85ef29c

…e level again

Block Entity custom name null instead of empty string

84e0d14

Remove old debug message

b625bda

use a static final variable for the owner nbt key instead.

0d8f91a

Use null for the SidedInvWrapper's side

Set minimum cooldown for sphere operation to 0

75385f7

Remove addons from our provider that don't exist

80e452b

SirEndii requested a review from zyxkad December 24, 2024 15:58

zyxkad reviewed Dec 26, 2024

View reviewed changes

SirEndii and others added 7 commits December 26, 2024 21:46

Use ownerId instead of owner for the memory card nbt tag name

34426b2

Co-authored-by: Kevin Z <[email protected]> Signed-off-by: Srendi <[email protected]>

Re use the game profile if usable when creating an APFakePlayer insta…

0be2076

…nce and remove deprecated function

Replace Modlist#isLoaded uses with our APAddons fields

30cf506

Display UUID in memory card tooltip when the user can't be found inst…

6676434

…ead of "unknown"

Register ChunkManager.registerTicketController on the right bus

d01faba

Fixed our conditional recipes and the automata_core recipe with the n…

c6b6283

…bt ingredient

Checkstyle

441077b

SirEndii requested a review from zyxkad December 26, 2024 21:17

zyxkad reviewed Dec 27, 2024

View reviewed changes

src/main/java/de/srendi/advancedperipherals/common/util/ChunkManager.java Show resolved Hide resolved

src/main/java/de/srendi/advancedperipherals/common/util/ChunkManager.java Show resolved Hide resolved

zyxkad reviewed Dec 27, 2024

View reviewed changes

.gitignore Show resolved Hide resolved

add the run folder back to the gitignore for old run datas on differe…

f7cdf1e

…nt branches

zyxkad approved these changes Dec 27, 2024

View reviewed changes

Add comment about the registered registerTicketController on th e m…

e524e84

…od bus

zyxkad approved these changes Dec 27, 2024

View reviewed changes

SirEndii merged commit a1dc890 into release/1.20.4 Dec 27, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port to 1.20.4 Neoforge #584

Port to 1.20.4 Neoforge #584

SirEndii commented Apr 15, 2024 •

edited

Loading

zyxkad commented Dec 23, 2024

zyxkad Dec 24, 2024

SirEndii Dec 24, 2024

SirEndii commented Dec 24, 2024

SirEndii commented Dec 26, 2024

Port to 1.20.4 Neoforge #584

Port to 1.20.4 Neoforge #584

Conversation

SirEndii commented Apr 15, 2024 • edited Loading

zyxkad commented Dec 23, 2024

zyxkad Dec 24, 2024

Choose a reason for hiding this comment

SirEndii Dec 24, 2024

Choose a reason for hiding this comment

SirEndii commented Dec 24, 2024

SirEndii commented Dec 26, 2024

SirEndii commented Apr 15, 2024 •

edited

Loading