Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
4f5df91
fix saddle turtle teleport between dimesions
zyxkad Jan 17, 2025
d80f787
fix stylecheck
zyxkad Jan 17, 2025
ad45ce2
adjust positions
zyxkad Jan 17, 2025
82c8ce6
fix cross dimension dismount with non-player
zyxkad Jan 17, 2025
8572367
fix missing operations
zyxkad Jan 17, 2025
83a9d63
sort
zyxkad Jan 17, 2025
794325c
add TODO
zyxkad Jan 17, 2025
12b1a37
add an override descriptor
zyxkad Jan 17, 2025
1363ef6
fix peripheral will not update in smartglasses
zyxkad Jan 18, 2025
4731502
remove empty line
zyxkad Jan 18, 2025
5d6ce68
fix automata turtle may dig itself at specific position
zyxkad Jan 18, 2025
917ab43
optimize getCapability
zyxkad Jan 19, 2025
9aa3062
add a few doc
zyxkad Jan 19, 2025
27c1ff8
add param <P>
zyxkad Jan 19, 2025
c196a59
add cable p2p tunnel
zyxkad Jan 20, 2025
94fa325
remove debug logs
zyxkad Jan 20, 2025
49dc39e
add Overrides
zyxkad Jan 20, 2025
002c447
checkstyle
zyxkad Jan 20, 2025
f16ee9c
updated -> updating
zyxkad Jan 20, 2025
91ef22a
Create p2p item model
SirEndii Jan 20, 2025
278aab1
Merge pull request #700 from zyxkad/detector-patch
SirEndii Jan 20, 2025
b5230f1
Merge pull request #697 from zyxkad/pick_block-feature
SirEndii Jan 20, 2025
016c6c2
Merge pull request #695 from zyxkad/dev/0.8
SirEndii Jan 20, 2025
a97a7b9
fix peripheral will not connect when changing tunnel type
zyxkad Jan 21, 2025
04c6f27
fix peripheral will detach and reattach when ME grid changes
zyxkad Jan 21, 2025
2b2f9d1
remove ae2.Integration and rename ae2.Registries to ae2.AE2Registries
zyxkad Jan 21, 2025
708c1c7
Merge pull request #702 from zyxkad/p2p-feature
zyxkad Jan 21, 2025
d25a844
fix smart glasses position
zyxkad Jan 25, 2025
27be42c
rename getWorldPos -> getPhysicsPos
zyxkad Jan 25, 2025
2e86ba8
add IPeripheralOwner.getHoldingEntity
zyxkad Jan 25, 2025
2dc9428
remove item.copy()s
zyxkad Jan 25, 2025
9c23810
refactor DistanceDetector
zyxkad Jan 26, 2025
f1e2c5a
fix registeriation
zyxkad Jan 26, 2025
7e4b041
fix smartglass direction
zyxkad Jan 26, 2025
17d99c3
abstract peripheral ticker
zyxkad Jan 26, 2025
34d9789
fix data storage for smartglass and save distance detector data in sm…
zyxkad Jan 26, 2025
a32365a
Merge pull request #705 from zyxkad/smartglass-patch
SirEndii Jan 26, 2025
8d1b6f7
fix ClassNotFoundException when VS is not installed
zyxkad Jan 26, 2025
8bf13da
Merge pull request #707 from zyxkad/vs-patch
SirEndii Jan 26, 2025
303af09
move valkyrienskies stuff to a middle integration class to prevent ea…
zyxkad Mar 9, 2025
222b703
re-enable testing environement mods
zyxkad Mar 9, 2025
d4b8b97
Merge pull request #717 from zyxkad/vs-patch
zyxkad Mar 15, 2025
25cb800
Merge branch 'dev/0.8' of https://github.com/IntelligenceModding/Adva…
zyxkad Mar 15, 2025
256cf0e
make keyboard based on computer ID instead of position
zyxkad Mar 15, 2025
5251139
run runData
zyxkad Mar 15, 2025
3549dd9
implement keyboard mouse capture mode
zyxkad Mar 15, 2025
d6dd79b
fix styles
zyxkad Mar 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,12 @@ repositories {
}
}
maven {
name = "Modmaven Jei"
name = "Modmaven"
url = 'https://modmaven.dev/'
content {
includeGroup("mezz.jei")
includeGroup("appeng")
includeGroup("mekanism")
includeGroup("mezz.jei")
}
}
maven {
Expand Down Expand Up @@ -376,20 +376,15 @@ dependencies {
// runtimeOnly fg.deobf("curse.maven:createaddition-439890:5099757")

// Valkyrien Skies 2
implementation("org.joml:joml:1.10.4") {
transitive = false
}
implementation("org.joml:joml-primitives:1.10.0") {
transitive = false
}
// implementation fg.deobf("org.valkyrienskies:valkyrienskies-119-common:${vs2_version}")
implementation fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}") {
transitive = false
}
compileOnly("org.joml:joml:1.10.4")
compileOnly("org.joml:joml-primitives:1.10.0")
// compileOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-common:${vs2_version}")
compileOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}")
compileOnly "org.valkyrienskies.core:api:${vs_core_version}"
compileOnly "org.valkyrienskies.core:api-game:${vs_core_version}"
compileOnly "org.valkyrienskies.core:util:${vs_core_version}"
compileOnly "org.valkyrienskies.core:impl:${vs_core_version}"
runtimeOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}")
runtimeOnly fg.deobf("curse.maven:valkyrien-skies-258371:${valkyrien_skies_version}")
runtimeOnly fg.deobf("curse.maven:eureka-ships-654384:${eureka_ships_version}")
runtimeOnly fg.deobf("curse.maven:clockwork-807792:${clockwork_version}")
Expand Down Expand Up @@ -427,12 +422,12 @@ task setupServer(type: Copy) {
}

["Client", "Server"].forEach { name ->
tasks.register("test$name", JavaExec.class).configure {
tasks.register("test${name}", JavaExec.class).configure {
it.group('In-game tests')
it.description("Runs tests on a temporary Minecraft instance.")
it.dependsOn(setupServer, "prepareRunTest$name", "cleanTest$name", 'compileTestModJava')
it.dependsOn(setupServer, "prepareRunTest${name}", "cleanTest${name}", 'compileTestModJava')

JavaExec exec = tasks.getByName("runTest$name")
JavaExec exec = tasks.getByName("runTest${name}")
exec.copyTo(it)
it.setClasspath(exec.getClasspath())
it.mainClass = exec.mainClass
Expand Down
42 changes: 23 additions & 19 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
org.gradle.jvmargs=-Xmx4G
org.gradle.logging.level=info

# Minecraft related
Expand All @@ -10,53 +10,57 @@ mod_id=advancedperipherals
mod_version=0.8r
minecraft_version=1.19.2
mod_artifact_suffix=

forge_version=43.4.0
loader_version=43

release_type=release

mappings_channel=parchment
mappings_version=2022.11.20-1.19.2
jb_annotations=21.0.1

# Test dependencies
junit_version=5.7.2
hamcrest_version=2.2
jb_annotations=21.0.1
junit_version=5.7.2
kotlin_version=1.8.0
kotlinx_coroutines_version=1.7.3
ttoolkit_version=0.1.3

# Mod dependencies
cc_version=1.101.3
curios_version=1.19.2-5.1.4.1
minecolonies_version=1.19.2-1.1.473-BETA
appliedenergistics_version=12.9.9
patchouli_version=1.19.2-77
refinedstorage_version=1.11.7

ae2additions_version=4646599
ae2things_version=4367610
appliedenergistics_version=12.9.12
appliedmekanistics_version=4734608
botania_version=1.19.2-440-FORGE
clockwork_version=5171528
create_version=0.5.1.f-46
createca_version=5099757
curios_version=1.19.2-5.1.4.1
dimstorage_version=3927875
eureka_ships_version=5321628
kotlinforforge_version=3.12.0
mekanism_version=1.19.2-10.3.9.13
ae2things_version=4367610
minecolonies_version=1.19.2-1.1.473-BETA
patchouli_version=1.19.2-77
powah_version=4183078
ae2additions_version=4646599
kotlinforforge_version=3.12.0
appliedmekanistics_version=4734608
dimstorage_version=3927875
refinedstorage_version=1.11.7
valkyrien_skies_version=4994898
eureka_ships_version=5321628
clockwork_version=5171528
vs2_version=2.1.2-beta.1+a04911c932
vs_core_version=1.1.0+2a62e6a823

# Mod dependencies which are needed for other mods
# For minecolonies
structurize_version=1.19.2-1.0.649-BETA
multipiston_version=1.19.2-1.2.21-ALPHA
blockui_version=1.19.2-0.0.102-ALPHA
domumornamentum_version=1.19-1.0.141-BETA
multipiston_version=1.19.2-1.2.21-ALPHA
structurize_version=1.19.2-1.0.649-BETA

# For DimStorage
edivadlib_version=3927847

# Mod dependencies for testing stuff(Only used in the dev environment)
# Mod dependencies for testing stuff (Only used in the dev environment)
jade_version=4914105
jei_version=1.19.2-forge:11.6.0.1016
jade_version=4914105
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
// 1.19.2 2024-05-28T14:53:16.653667 Tags for minecraft:item
// 1.19.2 2025-03-15T16:18:50.46663 Tags for minecraft:item
de4b4f45ec18b2b1f0db1c36882981042e20ee23 data/advancedperipherals/tags/items/p2p_attunements/cable_p2p_tunnel.json
72eba3b11f69e16c87488f7c4ba7cfdad42c378e data/advancedperipherals/tags/items/smart_glasses.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2024-05-28T14:53:16.655175 AP POI Type Tags
// 1.19.2 2025-03-15T16:18:50.465796 AP POI Type Tags
d3d6b837660a4e213f287ad9d11e12368b90cd8e data/minecraft/tags/point_of_interest_type/acquirable_job_site.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-05-28T14:53:16.655476 Turtle Upgrades
// 1.19.2 2025-03-15T16:18:50.466321 Turtle Upgrades
b8f19ae0fb5bb898facc08e3787e0f96c8211881 data/advancedperipherals/computercraft/turtle_upgrades/chatty_turtle.json
fe98c60e7d61139aacf2d0872873e610aac8a37b data/advancedperipherals/computercraft/turtle_upgrades/chunky_turtle.json
ae619da638ad89d7302d832d6c09e2c87401c539 data/advancedperipherals/computercraft/turtle_upgrades/compass_turtle.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-09-23T21:28:44.4809605 LootTables
// 1.19.2 2025-03-15T16:18:50.465594 LootTables
618b63c020ab64890c8a2d2506dd61cd30259a44 data/advancedperipherals/loot_tables/blocks/block_reader.json
0923665563d05307a7fa7d711a2d7a994a31eb6e data/advancedperipherals/loot_tables/blocks/chat_box.json
bf2a80256cfba0bd8c0283d493882e5816882f1f data/advancedperipherals/loot_tables/blocks/colony_integrator.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-05-28T14:53:16.657381 Recipes
// 1.19.2 2025-03-15T16:18:50.466743 Recipes
045608027e4a5ea2d7dee7f402346b8e69f21675 data/advancedperipherals/advancements/recipes/advancedperipheralstab/armor/smart_glasses_netherite.json
db2dada2fdf42ca1bbf47f1eb075d1f9de89dfa8 data/advancedperipherals/advancements/recipes/advancedperipheralstab/block_reader.json
77c55e8500be4a344ca563a8bf7642257cdc7b8b data/advancedperipherals/advancements/recipes/advancedperipheralstab/chat_box.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// 1.19.2 2024-05-28T14:53:16.655934 Pocket Computer Upgrades
// 1.19.2 2025-03-15T16:18:50.46512 Pocket Computer Upgrades
b672635324c0df354e587efc81d0b19a581eae2f data/advancedperipherals/computercraft/pocket_upgrades/chatty_pocket.json
30b8f663613c7ce77048fd69631afcc11a682276 data/advancedperipherals/computercraft/pocket_upgrades/colony_pocket.json
661dc77bd0442bfb2a5ed80cff271071817bb22d data/advancedperipherals/computercraft/pocket_upgrades/distance_pocket.json
d4647159c2f2693a9c5e8d12bf740635751d29a8 data/advancedperipherals/computercraft/pocket_upgrades/environment_pocket.json
8216a0a7d8ebe3ae738c8fc3626df25eb0a2e07a data/advancedperipherals/computercraft/pocket_upgrades/geoscanner_pocket.json
a38aa83593f7ad0ace98e01bb3b5f06f272ef734 data/advancedperipherals/computercraft/pocket_upgrades/player_pocket.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-05-28T14:53:16.658228 Block States: advancedperipherals
// 1.19.2 2025-03-15T16:18:50.466039 Block States: advancedperipherals
5e28ce1be9a6996d982641e5df1fa7162090b8cc assets/advancedperipherals/blockstates/block_reader.json
f42bdde60f84fdb312f7cf3b2be461d9c11ebdc8 assets/advancedperipherals/blockstates/chat_box.json
1227aa092fcf1327547ace6ccc9db230e45891b0 assets/advancedperipherals/blockstates/colony_integrator.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2025-01-18T00:08:46.0946621 Languages: en_us
d4cb5d2a7d78fc44e503663eb08d67a0fb981deb assets/advancedperipherals/lang/en_us.json
// 1.19.2 2025-03-15T16:18:50.465918 Languages: en_us
fe52123263b91f49093d74278e8709484e4dfe59 assets/advancedperipherals/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2025-01-16T15:46:41.859383 Block tags
// 1.19.2 2025-03-15T16:18:50.466493 Block tags
e1f71dcb4f9e7e36e29b0ad09d6520dc3adfa4a6 data/forge/tags/blocks/needs_wood_tool.json
03322cd493601129eaad6ba7c2a6d808023dfac1 data/minecraft/tags/blocks/mineable/pickaxe.json
277fe59db076a3eab3c97080531ad345f8ca5f3d data/minecraft/tags/blocks/needs_iron_tool.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"block.advancedperipherals.rs_bridge": "RS Bridge",
"curios.identifier.glasses": "Glasses",
"entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
"item.advancedperipherals.cable_p2p_tunnel": "Cable P2P Tunnel",
"item.advancedperipherals.chunk_controller": "Chunk Controller",
"item.advancedperipherals.computer_tool": "Computer Tool",
"item.advancedperipherals.end_automata_core": "End Automata Core",
Expand Down Expand Up @@ -81,6 +82,7 @@
"keybind.advancedperipherals.description": "Show Description",
"pocket.advancedperipherals.chatty_pocket": "Chatty",
"pocket.advancedperipherals.colony_pocket": "Colony",
"pocket.advancedperipherals.distance_pocket": "Distance Detector",
"pocket.advancedperipherals.environment_pocket": "Environment",
"pocket.advancedperipherals.geoscanner_pocket": "Geo",
"pocket.advancedperipherals.player_pocket": "Player Detector",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "advancedperipherals:distance_pocket",
"item": "advancedperipherals:distance_detector"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"computercraft:cable",
"computercraft:wired_modem",
"computercraft:wired_modem_full"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"values": [
"advancedperipherals:peripheral_casing",
"advancedperipherals:colony_integrator"
"advancedperipherals:peripheral_casing"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package de.srendi.advancedperipherals;

import de.srendi.advancedperipherals.common.addons.APAddons;
import de.srendi.advancedperipherals.common.addons.ae2.AE2Registries;
import de.srendi.advancedperipherals.common.configuration.APConfig;
import de.srendi.advancedperipherals.common.network.APNetworking;
import de.srendi.advancedperipherals.common.setup.APRegistration;
Expand All @@ -11,6 +12,7 @@
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
Expand All @@ -35,6 +37,7 @@ public AdvancedPeripherals() {
APConfig.register(ModLoadingContext.get());

modBus.addListener(this::commonSetup);
modBus.addListener(this::onLoadComplete);
APRegistration.register();
MinecraftForge.EVENT_BUS.register(this);
new APAddons();
Expand Down Expand Up @@ -67,4 +70,11 @@ public void commonSetup(FMLCommonSetupEvent event) {
});
}

public void onLoadComplete(FMLLoadCompleteEvent event) {
event.enqueueWork(() -> {
if (APAddons.appliedEnergisticsLoaded) {
AE2Registries.finishRegister();
}
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@ public static void renderingHuds(RenderGuiOverlayEvent.Pre event) {
@SubscribeEvent
public static void playerTryDismount(InputEvent.Key event) {
Minecraft minecraft = Minecraft.getInstance();
if (!minecraft.options.keyShift.matches(event.getKey(), event.getScanCode())) {
boolean isShift = minecraft.options.keyShift.matches(event.getKey(), event.getScanCode());
if (!isShift) {
return;
}
switch (event.getAction()) {
case InputConstants.PRESS:
sneaking = true;
if (ClientRegistry.SADDLE_TURTLE_OVERLAY.isPlayerMountedOnTurtle()) {
if (ClientRegistry.SADDLE_TURTLE_OVERLAY.isPlayerControllingTurtle()) {
minecraft.options.keyShift.setDown(false);
}
break;
Expand Down Expand Up @@ -65,7 +66,7 @@ public static void playerMounting(EntityMountEvent event) {

@SubscribeEvent
public static void playerMove(MovementInputUpdateEvent event) {
if (ClientRegistry.SADDLE_TURTLE_OVERLAY.isPlayerMountedOnTurtle()) {
if (ClientRegistry.SADDLE_TURTLE_OVERLAY.isPlayerControllingTurtle()) {
Input input = event.getInput();
if (sneaking == lastSneak && lastInput != null) {
if (lastInput.up == input.up && lastInput.down == input.down && lastInput.left == input.left && lastInput.right == input.right && lastInput.jumping == input.jumping) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package de.srendi.advancedperipherals.client;

import de.srendi.advancedperipherals.AdvancedPeripherals;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = AdvancedPeripherals.MOD_ID)
public class ClientWorker {

private static final Map<String, Runnable> tasks = new ConcurrentHashMap<>();

/**
* This method will put a task to current tick's end.
* If a task with given identifier is already exists, the task will be replaced.
*/
public static void put(final String id, final Runnable task) {
tasks.put(id, task);
}

@SubscribeEvent
public static void clientTick(TickEvent.ClientTickEvent event) {
if (event.phase == TickEvent.Phase.END) {
tasks.forEach((id, runnable) -> {
tasks.remove(id, runnable);
runnable.run();
});
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public DistanceDetectorRenderer(BlockEntityRendererProvider.Context pContext) {

@Override
public void render(@NotNull DistanceDetectorEntity pBlockEntity, float pPartialTick, @NotNull PoseStack pPoseStack, MultiBufferSource pBufferSource, int pPackedLight, int pPackedOverlay) {
if (pBlockEntity.getLaserVisibility()) {
if (pBlockEntity.getShowLaser()) {
float distance = pBlockEntity.getCurrentDistance();
float[] color = EnumColor.RED.getRgb();
if (distance == -1) {
Expand Down
Loading
Loading