From 3d183a29efdec6027ddd525f0ea5b45ccb8b9789 Mon Sep 17 00:00:00 2001 From: Souldbminer <162390887+souldbminersmwc@users.noreply.github.com> Date: Tue, 17 Jun 2025 12:31:46 -0400 Subject: [PATCH 1/8] Update FactoryGaugeScenes.java --- .../ponder/scenes/highLogistics/FactoryGaugeScenes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java index 2967837c80..a8dcc7c5ba 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java @@ -673,14 +673,14 @@ public static void recipe(SceneBuilder builder, SceneBuildingUtil util) { scene.overlay() .showText(70) - .text("...it will send new ingredients to the specified address") + .text("...it will send the required amount of ingredients to the specified address") .colored(PonderPalette.BLUE) .placeNearTarget() .attachKeyFrame() .pointAt(util.vector() .blockSurface(pack, Direction.WEST)); scene.idle(80); - + scene.world() .showSection(funnel1, Direction.DOWN); scene.idle(5); From 445c78c4293c315a8ad8b787f32bea2d7414c5f2 Mon Sep 17 00:00:00 2001 From: Souldbminer <162390887+souldbminersmwc@users.noreply.github.com> Date: Tue, 17 Jun 2025 12:37:18 -0400 Subject: [PATCH 2/8] Update FactoryGaugeScenes.java --- .../highLogistics/FactoryGaugeScenes.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java index a8dcc7c5ba..bf07d92b6f 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java @@ -673,7 +673,27 @@ public static void recipe(SceneBuilder builder, SceneBuildingUtil util) { scene.overlay() .showText(70) - .text("...it will send the required amount of ingredients to the specified address") + .text("...it will send the required ingredients to the specified address") + .colored(PonderPalette.BLUE) + .placeNearTarget() + .attachKeyFrame() + .pointAt(util.vector() + .blockSurface(pack, Direction.WEST)); + scene.idle(80); + + scene.overlay() + .showText(70) + .text("When multiple sources provide the same ingredients...") + .colored(PonderPalette.BLUE) + .placeNearTarget() + .attachKeyFrame() + .pointAt(util.vector() + .blockSurface(pack, Direction.WEST)); + scene.idle(80); + + scene.overlay() + .showText(70) + .text("...the Factory Gauge will request maximum amount of ingredients each source can provide, until the ingredient requirement is satisfied") .colored(PonderPalette.BLUE) .placeNearTarget() .attachKeyFrame() From 871d7fcfb0b6fb78fb5455b2e8a9145a13e31fc6 Mon Sep 17 00:00:00 2001 From: Souldbminer <162390887+souldbminersmwc@users.noreply.github.com> Date: Sun, 13 Jul 2025 16:54:40 -0400 Subject: [PATCH 3/8] Update FactoryGaugeScenes.java --- .../ponder/scenes/highLogistics/FactoryGaugeScenes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java index bf07d92b6f..0e7e4f54a4 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java @@ -693,7 +693,7 @@ public static void recipe(SceneBuilder builder, SceneBuildingUtil util) { scene.overlay() .showText(70) - .text("...the Factory Gauge will request maximum amount of ingredients each source can provide, until the ingredient requirement is satisfied") + .text("...the Factory Gauge will request ingredients from each source until the ingredient requirement is satisfied") .colored(PonderPalette.BLUE) .placeNearTarget() .attachKeyFrame() From 1bc2b37422570e7898d3be449a9a6024f74d2a3e Mon Sep 17 00:00:00 2001 From: Souldbminer <162390887+souldbminersmwc@users.noreply.github.com> Date: Sun, 13 Jul 2025 17:03:40 -0400 Subject: [PATCH 4/8] Blacklist other mobile launchers #1 --- .../java/com/simibubi/create/compat/pojav/PojavChecker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java b/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java index c57715f329..aac6ba0358 100644 --- a/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java +++ b/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java @@ -22,7 +22,7 @@ public class PojavChecker { private static final Logger LOGGER = LoggerFactory.getLogger(PojavChecker.class); - private static final Pattern KNOWN_ANDROID_PATH = Pattern.compile("/data/user/[0-9]+/net\\.kdt\\.pojavlaunch"); + private static final Pattern KNOWN_ANDROID_PATH = Pattern.compile("/data/user/[0-9]+/net\\.kdt"); public static final boolean IS_PRESENT = Util.make(() -> { if (System.getenv("POJAV_RENDERER") != null) { From 72254bcebb2265501aa9ff4688dc19d6940b48fc Mon Sep 17 00:00:00 2001 From: Souldbminer <162390887+souldbminersmwc@users.noreply.github.com> Date: Sun, 13 Jul 2025 17:05:23 -0400 Subject: [PATCH 5/8] Blacklist other mobile launchers #2 --- src/generated/resources/assets/create/lang/en_us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 4daf5e8cd0..122ba02325 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1275,7 +1275,7 @@ "create.gui.package_port.send_only": "Only send packages", "create.gui.pojav.content": "Mobile devices have extremely low quality graphics drivers, which cause visual issues that are impossible for Create to fix. No support will be provided for any issues you encounter.", "create.gui.pojav.continue": "Continue Anyway", - "create.gui.pojav.title": "Create is not supported on PojavLauncher.", + "create.gui.pojav.title": "Create is not supported on Mobile Launchers.", "create.gui.redstone_requester.allow_partial": "Allow partial orders", "create.gui.redstone_requester.dont_allow_partial": "Must send all items", "create.gui.redstone_requester.requester_address": "Send order to...", @@ -3368,4 +3368,4 @@ "item.create.zinc_nugget": "Zinc Nugget", "itemGroup.create.base": "Create", "itemGroup.create.palettes": "Create's Building Blocks" -} \ No newline at end of file +} From bf76fe32a06bf671dfd26e0afed24bb445733299 Mon Sep 17 00:00:00 2001 From: Souldbminer <162390887+souldbminersmwc@users.noreply.github.com> Date: Sun, 13 Jul 2025 17:03:40 -0400 Subject: [PATCH 6/8] Blacklist other mobile launchers --- src/generated/resources/assets/create/lang/en_us.json | 4 ++-- .../java/com/simibubi/create/compat/pojav/PojavChecker.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 4daf5e8cd0..122ba02325 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1275,7 +1275,7 @@ "create.gui.package_port.send_only": "Only send packages", "create.gui.pojav.content": "Mobile devices have extremely low quality graphics drivers, which cause visual issues that are impossible for Create to fix. No support will be provided for any issues you encounter.", "create.gui.pojav.continue": "Continue Anyway", - "create.gui.pojav.title": "Create is not supported on PojavLauncher.", + "create.gui.pojav.title": "Create is not supported on Mobile Launchers.", "create.gui.redstone_requester.allow_partial": "Allow partial orders", "create.gui.redstone_requester.dont_allow_partial": "Must send all items", "create.gui.redstone_requester.requester_address": "Send order to...", @@ -3368,4 +3368,4 @@ "item.create.zinc_nugget": "Zinc Nugget", "itemGroup.create.base": "Create", "itemGroup.create.palettes": "Create's Building Blocks" -} \ No newline at end of file +} diff --git a/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java b/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java index c57715f329..aac6ba0358 100644 --- a/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java +++ b/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java @@ -22,7 +22,7 @@ public class PojavChecker { private static final Logger LOGGER = LoggerFactory.getLogger(PojavChecker.class); - private static final Pattern KNOWN_ANDROID_PATH = Pattern.compile("/data/user/[0-9]+/net\\.kdt\\.pojavlaunch"); + private static final Pattern KNOWN_ANDROID_PATH = Pattern.compile("/data/user/[0-9]+/net\\.kdt"); public static final boolean IS_PRESENT = Util.make(() -> { if (System.getenv("POJAV_RENDERER") != null) { From 97038231ad5c61e265f8a0be90f6668ea2487812 Mon Sep 17 00:00:00 2001 From: souldbminersmwc Date: Sun, 13 Jul 2025 17:09:44 -0400 Subject: [PATCH 7/8] Revert "Blacklist other mobile launchers" This reverts commit bf76fe32a06bf671dfd26e0afed24bb445733299. --- src/generated/resources/assets/create/lang/en_us.json | 4 ++-- .../java/com/simibubi/create/compat/pojav/PojavChecker.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 122ba02325..4daf5e8cd0 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1275,7 +1275,7 @@ "create.gui.package_port.send_only": "Only send packages", "create.gui.pojav.content": "Mobile devices have extremely low quality graphics drivers, which cause visual issues that are impossible for Create to fix. No support will be provided for any issues you encounter.", "create.gui.pojav.continue": "Continue Anyway", - "create.gui.pojav.title": "Create is not supported on Mobile Launchers.", + "create.gui.pojav.title": "Create is not supported on PojavLauncher.", "create.gui.redstone_requester.allow_partial": "Allow partial orders", "create.gui.redstone_requester.dont_allow_partial": "Must send all items", "create.gui.redstone_requester.requester_address": "Send order to...", @@ -3368,4 +3368,4 @@ "item.create.zinc_nugget": "Zinc Nugget", "itemGroup.create.base": "Create", "itemGroup.create.palettes": "Create's Building Blocks" -} +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java b/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java index aac6ba0358..c57715f329 100644 --- a/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java +++ b/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java @@ -22,7 +22,7 @@ public class PojavChecker { private static final Logger LOGGER = LoggerFactory.getLogger(PojavChecker.class); - private static final Pattern KNOWN_ANDROID_PATH = Pattern.compile("/data/user/[0-9]+/net\\.kdt"); + private static final Pattern KNOWN_ANDROID_PATH = Pattern.compile("/data/user/[0-9]+/net\\.kdt\\.pojavlaunch"); public static final boolean IS_PRESENT = Util.make(() -> { if (System.getenv("POJAV_RENDERER") != null) { From 9462a686205da001c52fc1d6d13d05b0e7ee8361 Mon Sep 17 00:00:00 2001 From: souldbminersmwc Date: Sun, 13 Jul 2025 17:10:04 -0400 Subject: [PATCH 8/8] Revert "Merge branch 'mc1.20.1/dev' of https://github.com/souldbminersmwc/Create into mc1.20.1/dev" This reverts commit c4da05763ff2d1644563434e1e28f099353b80b4, reversing changes made to 97038231ad5c61e265f8a0be90f6668ea2487812. --- src/generated/resources/assets/create/lang/en_us.json | 4 ++-- .../java/com/simibubi/create/compat/pojav/PojavChecker.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 122ba02325..4daf5e8cd0 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1275,7 +1275,7 @@ "create.gui.package_port.send_only": "Only send packages", "create.gui.pojav.content": "Mobile devices have extremely low quality graphics drivers, which cause visual issues that are impossible for Create to fix. No support will be provided for any issues you encounter.", "create.gui.pojav.continue": "Continue Anyway", - "create.gui.pojav.title": "Create is not supported on Mobile Launchers.", + "create.gui.pojav.title": "Create is not supported on PojavLauncher.", "create.gui.redstone_requester.allow_partial": "Allow partial orders", "create.gui.redstone_requester.dont_allow_partial": "Must send all items", "create.gui.redstone_requester.requester_address": "Send order to...", @@ -3368,4 +3368,4 @@ "item.create.zinc_nugget": "Zinc Nugget", "itemGroup.create.base": "Create", "itemGroup.create.palettes": "Create's Building Blocks" -} +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java b/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java index aac6ba0358..c57715f329 100644 --- a/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java +++ b/src/main/java/com/simibubi/create/compat/pojav/PojavChecker.java @@ -22,7 +22,7 @@ public class PojavChecker { private static final Logger LOGGER = LoggerFactory.getLogger(PojavChecker.class); - private static final Pattern KNOWN_ANDROID_PATH = Pattern.compile("/data/user/[0-9]+/net\\.kdt"); + private static final Pattern KNOWN_ANDROID_PATH = Pattern.compile("/data/user/[0-9]+/net\\.kdt\\.pojavlaunch"); public static final boolean IS_PRESENT = Util.make(() -> { if (System.getenv("POJAV_RENDERER") != null) {