Port to 1.20.4 Neoforge #584
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixed that the entity of the SmartGlassesAccess is always null due to ignoring armor items when checking if the glasses are in the player's inventory Fixed that modules don't get loaded properly Fixed wrong slot texture if the peripherals tab is active Implement IPeripheralPlugin to the IModuleFunctions so we can easily add them to the glasses later
# Conflicts: # .github/ISSUE_TEMPLATE/bug_report.yml # build.gradle # gradle.properties # src/main/java/de/srendi/advancedperipherals/APCreativeTab.java # src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java # src/main/java/de/srendi/advancedperipherals/common/addons/APAddons.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/TurtlePeripheralOwner.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/turtles/TurtleChatBoxUpgrade.java # src/main/java/de/srendi/advancedperipherals/common/addons/create/FluidTankIntegration.java # src/main/java/de/srendi/advancedperipherals/common/addons/create/Integration.java # src/main/java/de/srendi/advancedperipherals/common/data/BlockLootTables.java # src/main/java/de/srendi/advancedperipherals/common/data/DataGenerators.java # src/main/java/de/srendi/advancedperipherals/common/data/EnUsLanguageProvider.java # src/main/java/de/srendi/advancedperipherals/common/data/PocketUpgradesProvider.java # src/main/java/de/srendi/advancedperipherals/common/data/PoiTypeProvider.java # src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java # src/main/java/de/srendi/advancedperipherals/common/data/TurtleUpgradesProvider.java # src/main/java/de/srendi/advancedperipherals/common/items/APBlockItem.java # src/main/java/de/srendi/advancedperipherals/common/items/APItem.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/CCRegistration.java # src/main/java/de/srendi/advancedperipherals/common/setup/Villagers.java # src/main/java/de/srendi/advancedperipherals/common/util/fakeplayer/FakePlayerProviderTurtle.java # src/main/java/de/srendi/advancedperipherals/common/util/inventory/ItemUtil.java # src/main/java/de/srendi/advancedperipherals/common/village/VillageStructures.java
…nd bugs, not nothing too annoying
# Conflicts: # src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java
# Conflicts: # src/generated/resources/.cache/2db41954e490230d51b10affff25ee2ee27b8d5b # src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d # src/generated/resources/.cache/5a761efb7472ef97566e41e81451930a004134bf # src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e # src/generated/resources/.cache/ae219fa7c7d3297c14e454863eac3998a4eab78c # src/generated/resources/.cache/b8526e444ae7356037f3a813274f6835d1f3dd16 # src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 # src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 # src/generated/resources/assets/advancedperipherals/lang/en_us.json # src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/MeBridgeEntity.java # src/main/java/de/srendi/advancedperipherals/common/data/EnUsLanguageProvider.java
# Conflicts: # gradle.properties
…older variation was called too late which led to not functioning features
# Conflicts: # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java
# Conflicts: # gradle.properties
# Conflicts: # build.gradle # gradle.properties # src/main/java/de/srendi/advancedperipherals/client/HudOverlayHandler.java # src/main/java/de/srendi/advancedperipherals/common/addons/APAddons.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/PlayerDetectorPeripheral.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/RsBridgePeripheral.java # src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RefinedStorage.java # src/main/java/de/srendi/advancedperipherals/common/argoggles/ARRenderAction.java # src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/ARControllerEntity.java # src/main/java/de/srendi/advancedperipherals/common/configuration/PeripheralsConfig.java # src/main/java/de/srendi/advancedperipherals/common/events/Events.java # src/main/java/de/srendi/advancedperipherals/common/items/ARGogglesItem.java # src/main/java/de/srendi/advancedperipherals/common/util/CoordUtil.java # src/main/java/de/srendi/advancedperipherals/network/messages/RequestHudCanvasMessage.java
# Conflicts: # build.gradle
# Conflicts: # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java # src/main/java/de/srendi/advancedperipherals/network/MNetwork.java
…the server side of things
We don't want to create a hell of arguments for functions but instead use a table with properties like our filters. But note that this is not final, I am aware of the security risks with this system
…s is currently not a clean way, but I need to sync the project to another device...
…int to the fields of our class. We're now using an annotation based system to further improve security and implement optional range limits needed for some values.
fix useOnBlock will returns PASS on some specific case
rename getEnergy -> getStoredEnergy
Fix filters resolve #648
Signed-off-by: Srendi <info@denizdemiroglu.de>
Fix entity operation does not have enough reach range than expected
# Conflicts: # CHANGELOG.md # gradle.properties # src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java # src/main/java/de/srendi/advancedperipherals/common/addons/powah/FurnatorIntegration.java # src/main/java/de/srendi/advancedperipherals/common/addons/powah/ReactorIntegration.java # src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RefinedStorage.java # src/main/java/de/srendi/advancedperipherals/common/util/fakeplayer/APFakePlayer.java # src/main/java/de/srendi/advancedperipherals/common/village/VillagerTrades.java
use tick rather than epoch time
only clear owner when new empty card is swapped but not after load
# Conflicts: # build.gradle # gradle.properties # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataChargingPlugin.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataItemSuckPlugin.java # src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/InventoryManagerEntity.java # src/main/java/de/srendi/advancedperipherals/common/util/ChunkManager.java
…tand every change yet This commit mainly exists because I need to switch machines and for a 1.20.1 merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: