Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev/1.19.2 into dev/1.20.1 #626

Merged
merged 187 commits into from
Jun 3, 2024

Conversation

zyxkad
Copy link
Collaborator

@zyxkad zyxkad commented Jun 2, 2024

  • Goodbye stinky
  • [Fluid Detector, Gas Detector / Flow Detector #250]Added Fluid Detector
  • No Energy
  • Added the gas detector
  • Fixed detectors not saving max flow rate
  • Fixed getTransferRate() - gas detector
  • [#320] Added the basics of a distance detector Checking the distance does work for the upper direction of the block The key elements are mising - Height mode - Mode for transparent blocks - Mode for entities - Laser visibility - direction of the block
  • Added getRadiation to the environment detector
  • 1.19.3 for 0.8
  • Adapt me and rs bridge functions. Both bridges now have the same functions with the same names. This makes it easier to support both in the same script Still needs some adjustments and documentation
  • Some distance detector stuff
  • Some distance detection work, added the ability to also scan for entities
  • Laser pew pew
  • Remove deprecation of IInventoryBlock.java
  • Update some dependencies
  • Run on selfhosted
  • Some very very basic smart glasses approaches. This just adds the smart glasses as item and the computer with a terminal behind it. A custom API and a flat.lua file in the rom do exist too
  • Checked the style
  • Re-add the smart glasses model
  • Away with you
  • Add a new memory card texture with a bounded property
  • Added an inventory and an item handler for the glasses
  • Added a smart glasses interface
  • [meBridge function exportItemToPeripheral() ignoring count #423] Fixed that some functions of the me and rs bridge ignore or increasing the count they want to export
  • tidy
  • Refactored the screens into the client package Added a debug to the server worker
  • Some UI stuff
  • Added a new taiga village structure
  • Finished the UI. Added a modules and peripheral tab with proper visualization. Added the ability to add peripherals to the glasses which also get added to the glasses computer
  • First thoughts about the module system
  • Added modules in the form of items, every item which is a module implements IModuleItem which contains a method for the actual IModel. The IModel then contains a tick method and a method for the name of the module. To implement lua functions into that module, we create a class which implements IModuleFunctions which then contains the methods annotated with the LuaFunction annotation The modules can be accessed by the peripheral on the back of the glasses. Because of that, I removed the back slot of the peripheral slots. Modules and peripherals are now indexed when the inventory updates and not every tick
  • Remove old ar controller block and peripheral
  • Some distance detector progress
  • [#320] Finished the distance detector. Everything seems to work fine, the only thing I want to add is an event.
  • Add some documentation and satisfy checkstyle
  • 🧹
  • Fixed detection type
  • Load ap addons statically Return an itemstack created from the AEItemKey instead of a new itemstack to fix ME Bridge Deletes NBT Data on exportItem(item: table, direction: string) -> number, err: string #427
  • Fixed some compiling issues
  • More context please
  • Unify the rs and me bridge methods by using an interface. Adds more functions and makes the ME and RS Bridge work the same
  • Do the same for the rs bridge.
  • I'm casting away
  • Port 0.8 pack to 1.19.2 since we do not support 1.19.3 anymore.
  • Adapt to checkstyle rules
  • Woopsy
  • Do some safety checks to satisfy sonar
  • Fix creative tab Satisfy checkstyle
  • Fixing a bug which I made by mistake
  • Minor bug fixes and improvements for the smart glasses system
  • Fix some compiling and checkstyle issues. We still have some issues and bugs, not nothing too annoying
  • Refactor imports, improve comment clarity and fix that APAddons wasn't initialized
  • Remove DEV from the version since our pipeline does handle this automatically
  • Change the loading of our APAddons class to static loading since the older variation was called too late which led to not functioning features
  • Check the style
  • copy cat
  • Runned datagen
  • Fixed that peripherals remain in the glasses computer after removing them
  • Cleanups, docs and a ui fix
  • Fixed smartglasses smithing recipe
  • Prototype for an object bases rendering system. Currently working on the server side of things
  • Implemented mapping functionality via reflections.
  • Starting to use annotations for our properties to improve safety. This is currently not a clean way, but I need to sync the project to another device...
  • Improve the way how we map the arguments retrieved from the lua endpoint 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.
  • swoosh
  • Trying a way to sync the overlay objects to the client of a player. Actual synchronisation isn't implemented, this is just a prototype
  • Move to snake_case peripheral names to better fit with CC:T's standards
  • Remove our to/fromPeripheral functions and add the logic for peripheral based storages directly to the impport and export functions Needs to be documented
  • Don't check dependency licenses
  • Fixed the colony integrator
  • Add missing applied mekanistics to the build.gradle
  • Start to implement more of the RS Bridge and ME Bridge IStorageSystemPeripheral functions. Also started adding better pattern support for both. WIP commit, commited due to device change
  • Implement pattern filtering for the me bridge
  • Fixed pattern listing. AE2 does not offer a way to get all patterns of the system. To solve this, we probe over all connected nodes in the system and check if they have patterns. This is adapted from the PatternAccessTerminal which does the same
  • Improve and extend the functionality of the ME Bridge by implementing 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
  • Some cleanup
  • [ME Bridge using bytes for internal storage and item count for external storage. #539] Remove the external storage counters from the internal functions
  • Add Drives and Cells support to the ME Bridge
  • use the BasicCellInventory class instead of trying to get the information we need out of the item tag. Add a usedBytes and totalBytes field to the drive's object
  • [[1.16.5] Turtles show nothing on-hover in JEI recipes #51] Start an implementation for getCraftingTasks and cancelCraftingTasks
  • Set lua function to use the main tread.
  • Add peripheral functions for the Dim Chest of the Dimensional Storage mod. Also add Jade for better testing purposes.
  • Implement prototype of cancelCraftingTasks to the ME Bridge
  • [[Feature]TOP/Hwyla integration #13] Add a hotkey module
  • AP-Features-13 Fixed hotkey module not working on servers
  • Fixed the smart glasses ui when playing on servers
  • Add the ability for the modules to inventory tick and fix double queued glassesKeyPressed event
  • !
  • Add a night vision module to the smart glasses 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
  • Satisfy checkstyle
  • add advanced place method to the compass peripheral
  • costs fuel when tring to use compass to place in far distance
  • add wall operation
  • rename argument wall -> anchor
  • fix stylecheck
  • use nil instead of false
  • use validateSide instaed of Direction.byName
  • call livingEntityToLua but not entityToLua when serializing animal fix scanEntities(range) table missing health fields #592
  • Implement cancelCraftingTasks for the ME Bridge
  • add pitch & yaw argument to automata core close Up/down versions of automata block methods Advanced-Peripherals-Features#43 fix Automata Core do not use turtle's heading as fake player's direction #419
  • add player.doActionWithRot instead of writing ton of overload methods
  • fix java generic
  • fix missing imports
  • remove unused import
  • accept NBTed items as turtle upgrade fix Impossible to craft compass turtle #599
  • add slot field to inventoryManager.getItemInHand close Add slot info for inventoryManager.getItemInHand Advanced-Peripherals-Features#67
  • make inventoryManager.getItem return nil instead of empty table
  • change slot index starts from 1 fix Slot indices are 0-based instead of 1-based #587
  • add UnsafeConfig for ignore NBT
  • fix null pointer
  • fix automata core will place two blocks at a time
  • remove unused imports
  • move place method from compass to automataBlockHandPlugin
  • add comment for placeBlock method
  • add static keyword for internal class
  • remove extra empty lines
  • fix typo forward -> front
  • make the directions makes more sense
  • fix playNote will not trigger alley fix Note block does not trigger allay #603
  • fix playNote will not trigger alley fix Note block does not trigger allay #603
  • Revert "Merge branch 'dev/0.8' into dev/1.19.2"
  • Skip the calculation of storage busses without any connected storage block
  • lost -> lose, behaviour -> behavior (American English)
  • Fixed isOnEnchantedSoil() for the mana flower integration
  • Satisfy checkstyle
  • fix player can bypass the maximum chatbox range by setting a negative message range fix Chat Box allows sending of chat messages with negative range #623
  • fix playerdetector bypass range issue
  • forgot to remove a Math.min
  • fix README link and missing semicolon
  • fix version changes

PLEASE READ THE GUIDELINES BEFORE MAKING A CONTRIBUTION

  • Please check if the PR fulfills these requirements
  • The commit message are well described
  • All changes have fully been tested

# Conflicts:
#	gradle.properties
#	src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
#	src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java
#	src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java
Checking the distance does work for the upper direction of the block
The key elements are mising
- Height mode
- Mode for transparent blocks
- Mode for entities
- Laser visibility
- direction of the block
# Conflicts:
#	gradle.properties
#	src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java
#	src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ARControllerPeripheral.java
#	src/main/java/de/srendi/advancedperipherals/common/addons/mekanism/EnvironmentRadiationPlugin.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/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/ARGogglesItem.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/common/setup/Villagers.java
#	src/main/java/de/srendi/advancedperipherals/common/village/VillagerTrades.java
#	src/main/java/de/srendi/advancedperipherals/network/messages/UpdateHudCanvasMessage.java
…tions with the same names. This makes it easier to support both in the same script

Still needs some adjustments and documentation
# Conflicts:
#	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/peripheral/MeBridgePeripheral.java
#	src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/RsBridgePeripheral.java
#	src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/ChatBoxEntity.java
#	src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/EnergyDetectorEntity.java
#	src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/RedstoneIntegratorEntity.java
#	src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java
#	src/main/java/de/srendi/advancedperipherals/common/items/ARGogglesItem.java
#	src/main/java/de/srendi/advancedperipherals/common/setup/BlockEntityTypes.java
#	src/main/java/de/srendi/advancedperipherals/common/village/VillagerTrades.java
# Conflicts:
#	gradle.properties
#	src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
#	src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
#	src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java
#	src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java
…rt glasses as item and the computer with a terminal behind it. A custom API and a `flat.lua` file in the rom do exist too
# Conflicts:
#	src/generated/resources/.cache/2db41954e490230d51b10affff25ee2ee27b8d5b
#	src/generated/resources/.cache/5a761efb7472ef97566e41e81451930a004134bf
#	src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2
#	src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
#	src/generated/resources/.cache/ae219fa7c7d3297c14e454863eac3998a4eab78c
#	src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
#	src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218
#	src/generated/resources/data/advancedperipherals/advancements/recipes/advancedperipheralstab/armor/smart_glasses_netherite.json
#	src/generated/resources/data/advancedperipherals/advancements/recipes/advancedperipheralstab/smart_glasses.json
#	src/generated/resources/data/advancedperipherals/recipes/colony_integrator.json
zyxkad and others added 24 commits April 30, 2024 15:47
This reverts commit 70fcad1, reversing
changes made to 529d8a6.
[Feature] add advanced place method to automata core when compass peripheral is equipped
fix player can bypass the maximum chatbox/playerdetector range by setting a negative range
Continue to fix chatbox range, forgot to remove a Math.min
Conflicts:
	.github/ISSUE_TEMPLATE/bug_report.yml
	src/main/java/de/srendi/advancedperipherals/common/addons/botania/ManaFlowerIntegration.java
	src/main/java/de/srendi/advancedperipherals/common/util/fakeplayer/APFakePlayer.java
	src/main/java/de/srendi/advancedperipherals/common/util/fakeplayer/FakePlayerProviderTurtle.java
@zyxkad
Copy link
Collaborator Author

zyxkad commented Jun 2, 2024

horrible 187 commits included dev/0.8 because of my last mis-merge which is reverted :(

@zyxkad zyxkad requested a review from SirEndii June 2, 2024 19:37
@SirEndii
Copy link
Member

SirEndii commented Jun 3, 2024

horrible 187 commits included dev/0.8 because of my last mis-merge which is reverted :(

Also my fault because I didn't see that ;D

@SirEndii SirEndii merged commit e6ea969 into IntelligenceModding:dev/1.20.1 Jun 3, 2024
2 checks passed
@SirEndii
Copy link
Member

SirEndii commented Jun 3, 2024

In general, I agree, linking the issues with a PR. But we follow the convention that we only close the issues after we released a fix for it. Or else, they're not fixed in production

@zyxkad
Copy link
Collaborator Author

zyxkad commented Jun 3, 2024

In general, I agree, linking the issues with a PR. But we follow the convention that we only close the issues after we released a fix for it. Or else, they're not fixed in production

Ah ye, you know github will automatically close issue when something commited to the default branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment