Fix versioncheck#66

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.

Sign up for GitHub

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

Open
HotWaterFlask wants to merge 4 commits into
base:master
Choose a base branch
from
Open

Fix versioncheck #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ab71e7
Add files via upload
HotWaterFlask Aug 26, 2026
e9ac5ae
26.2support
HotWaterFlask Aug 26, 2026
841d802
Paper 26.2（Minecraft "Chaos Cubed" 更新）
HotWaterFlask Aug 26, 2026
148ae24
修复26.2 中 net.minecraft.resources.ResourceLocation 已被重命名为 net.minecraf…
HotWaterFlask Aug 26, 2026
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.yuttyann</groupId>
<artifactId>ScriptBlockPlus</artifactId>
<version>2.3.4</version>
<version>2.3.5</version>

<name>ScriptBlockPlus</name>
<url>https://github.com/yuttyann/ScriptBlockPlus</url>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/github/yuttyann/scriptblockplus/utils/server/NetMinecraft.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ public enum NetMinecraft implements SimpleReflection {
WORLD_ENTITY_ITEM(WORLD_ENTITY, "item"),
/** {@code net.minecraft.world.entity.monster} */
WORLD_ENTITY_MONSTER(WORLD_ENTITY, "monster"),
/** {@code net.minecraft.world.entity.monster.cubemob} */
WORLD_ENTITY_MONSTER_CUBEMOB(WORLD_ENTITY_MONSTER, "cubemob"),
/** {@code net.minecraft.world.entity.monster.breeze} */
WORLD_ENTITY_MONSTER_BREEZE(WORLD_ENTITY_MONSTER, "breeze"),
/** {@code net.minecraft.world.entity.monster.hoglin} */
Expand Down
60 changes: 57 additions & 3 deletions ...m/github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessorLegacy.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -62,6 +63,19 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
private final Object blockPosZero;
private final Object magmaCubeType;

/**
* ゲームバージョンに応じた MagmaCube クラスを取得します。
* <p>
* 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
*/
private static Class<?> getMagmaCubeClass() {
try {
return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
} catch (IllegalArgumentException e) {
return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
}
}

PaperRemappedAccessorLegacy() throws ReflectiveOperationException {
// sendPacket
field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -257,13 +271,13 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
.findFirst("ContainerMenu.checkReachable");

// newMagmaCube
construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
construct(getMagmaCubeClass())
.parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
.findFirst("MagmaCube");

// newCraftMagmaCube
construct(ENTITY.getClass("CraftMagmaCube"))
.parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
.parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
.findFirst("CraftMagmaCube");

// newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -315,10 +329,50 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
this.m = methods();
this.c = constructs();
this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
this.magmaCubeType = getMagmaCubeType();
this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
}

/**
* ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
* <p>
* 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
* {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
*/
private static Object getMagmaCubeType() throws ReflectiveOperationException {
// 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
try {
return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
.fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
} catch (NullPointerException ignored) { }

// 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
try {
var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
Class<?> identifierClass;
try {
// 1.21.11 以降は ResourceLocation が Identifier に改名された
identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
} catch (IllegalArgumentException ignored) {
identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
}
var parseMethod = identifierClass.getMethod("parse", String.class);
var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
return getValueMethod.invoke(registry, magmaCubeKey);
} catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

// 3. CraftEntityType.bukkitToMinecraft から取得
try {
var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
}

@Override
public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
var temp = new Object[] { packet };
Expand Down
60 changes: 57 additions & 3 deletions ...github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessor_v1_21_6.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -63,6 +64,19 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
private final Object blockPosZero;
private final Object magmaCubeType;

/**
* ゲームバージョンに応じた MagmaCube クラスを取得します。
* <p>
* 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
*/
private static Class<?> getMagmaCubeClass() {
try {
return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
} catch (IllegalArgumentException e) {
return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
}
}

PaperRemappedAccessor_v1_21_6() throws ReflectiveOperationException {
// sendPacket
field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -258,13 +272,13 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
.findFirst("ContainerMenu.checkReachable");

// newMagmaCube
construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
construct(getMagmaCubeClass())
.parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
.findFirst("MagmaCube");

// newCraftMagmaCube
construct(ENTITY.getClass("CraftMagmaCube"))
.parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
.parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
.findFirst("CraftMagmaCube");

// newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -316,10 +330,50 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
this.m = methods();
this.c = constructs();
this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
this.magmaCubeType = getMagmaCubeType();
this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
}

/**
* ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
* <p>
* 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
* {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
*/
private static Object getMagmaCubeType() throws ReflectiveOperationException {
// 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
try {
return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
.fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
} catch (NullPointerException ignored) { }

// 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
try {
var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
Class<?> identifierClass;
try {
// 1.21.11 以降は ResourceLocation が Identifier に改名された
identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
} catch (IllegalArgumentException ignored) {
identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
}
var parseMethod = identifierClass.getMethod("parse", String.class);
var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
return getValueMethod.invoke(registry, magmaCubeKey);
} catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

// 3. CraftEntityType.bukkitToMinecraft から取得
try {
var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
}

@Override
public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
var temp = new Object[] { packet };
Expand Down
21 changes: 19 additions & 2 deletions src/main/java/com/github/yuttyann/scriptblockplus/utils/version/Version.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,25 @@ public static Version of(@NotNull String version) {
if (dot1 < 0) {
throw new IllegalArgumentException("Invalid Version: " + version);
}
int part1 = parseInt(version, 0, dot1, 10), part2 = parseInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2, 10);
return of(part1, part2, dot2 >= 0 ? parseInt(version, dot2 + 1, version.length(), 10) : 0, qualifier);
int part1 = parseLeadingInt(version, 0, dot1);
int part2 = parseLeadingInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2);
int part3 = dot2 >= 0 ? parseLeadingInt(version, dot2 + 1, version.length()) : 0;
return of(part1, part2, part3, qualifier);
}

/**
* 文字列の先頭から連続する数字を抽出して int に変換します。
* 数字が1つも無い場合は0を返します。
*/
private static int parseLeadingInt(@NotNull String s, int start, int end) {
int actualEnd = start;
while (actualEnd < end && Character.isDigit(s.charAt(actualEnd))) {
actualEnd++;
}
if (actualEnd == start) {
return 0;
}
return parseInt(s, start, actualEnd, 10);
}

@NotNull
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix versioncheck#66

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.

 Sign up for GitHub

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

 Open

HotWaterFlask
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix versioncheck
#66
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6ab71e7

Add files via upload


HotWaterFlask Aug 26, 2026
e9ac5ae

26.2support


HotWaterFlask Aug 26, 2026
841d802

Paper 26.2（Minecraft "Chaos Cubed" 更新）


HotWaterFlask Aug 26, 2026
148ae24

修复26.2 中 net.minecraft.resources.ResourceLocation 已被重命名为 net.minecraf…


HotWaterFlask Aug 26, 2026

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


2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.github.yuttyann</groupId>
 <artifactId>ScriptBlockPlus</artifactId>
 <version>2.3.4</version>
 <version>2.3.5</version>

 <name>ScriptBlockPlus</name>
 <url>https://github.com/yuttyann/ScriptBlockPlus</url>
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/server/NetMinecraft.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ public enum NetMinecraft implements SimpleReflection {
 WORLD_ENTITY_ITEM(WORLD_ENTITY, "item"),
 /** {@code net.minecraft.world.entity.monster} */
 WORLD_ENTITY_MONSTER(WORLD_ENTITY, "monster"),
 /** {@code net.minecraft.world.entity.monster.cubemob} */
 WORLD_ENTITY_MONSTER_CUBEMOB(WORLD_ENTITY_MONSTER, "cubemob"),
 /** {@code net.minecraft.world.entity.monster.breeze} */
 WORLD_ENTITY_MONSTER_BREEZE(WORLD_ENTITY_MONSTER, "breeze"),
 /** {@code net.minecraft.world.entity.monster.hoglin} */
Expand Down

60 changes: 57 additions & 3 deletions
...m/github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessorLegacy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -62,6 +63,19 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessorLegacy() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -257,13 +271,13 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -315,10 +329,50 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

60 changes: 57 additions & 3 deletions
...github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessor_v1_21_6.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -63,6 +64,19 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessor_v1_21_6() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -258,13 +272,13 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -316,10 +330,50 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

21 changes: 19 additions & 2 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/version/Version.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,25 @@ public static Version of(@NotNull String version) {
 if (dot1 < 0) {
 throw new IllegalArgumentException("Invalid Version: " + version);
 }
 int part1 = parseInt(version, 0, dot1, 10), part2 = parseInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2, 10);
 return of(part1, part2, dot2 >= 0 ? parseInt(version, dot2 + 1, version.length(), 10) : 0, qualifier);
 int part1 = parseLeadingInt(version, 0, dot1);
 int part2 = parseLeadingInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2);
 int part3 = dot2 >= 0 ? parseLeadingInt(version, dot2 + 1, version.length()) : 0;
 return of(part1, part2, part3, qualifier);
 }

 /**
 * 文字列の先頭から連続する数字を抽出して int に変換します。
 * 数字が1つも無い場合は0を返します。
 */
 private static int parseLeadingInt(@NotNull String s, int start, int end) {
 int actualEnd = start;
 while (actualEnd < end && Character.isDigit(s.charAt(actualEnd))) {
 actualEnd++;
 }
 if (actualEnd == start) {
 return 0;
 }
 return parseInt(s, start, actualEnd, 10);
 }

 @NotNull
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix versioncheck#66

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.

 Sign up for GitHub

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

 Open

HotWaterFlask
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix versioncheck
#66
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6ab71e7

Add files via upload


HotWaterFlask Aug 26, 2026
e9ac5ae

26.2support


HotWaterFlask Aug 26, 2026
841d802

Paper 26.2（Minecraft "Chaos Cubed" 更新）


HotWaterFlask Aug 26, 2026
148ae24

修复26.2 中 net.minecraft.resources.ResourceLocation 已被重命名为 net.minecraf…


HotWaterFlask Aug 26, 2026

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


2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.github.yuttyann</groupId>
 <artifactId>ScriptBlockPlus</artifactId>
 <version>2.3.4</version>
 <version>2.3.5</version>

 <name>ScriptBlockPlus</name>
 <url>https://github.com/yuttyann/ScriptBlockPlus</url>
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/server/NetMinecraft.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ public enum NetMinecraft implements SimpleReflection {
 WORLD_ENTITY_ITEM(WORLD_ENTITY, "item"),
 /** {@code net.minecraft.world.entity.monster} */
 WORLD_ENTITY_MONSTER(WORLD_ENTITY, "monster"),
 /** {@code net.minecraft.world.entity.monster.cubemob} */
 WORLD_ENTITY_MONSTER_CUBEMOB(WORLD_ENTITY_MONSTER, "cubemob"),
 /** {@code net.minecraft.world.entity.monster.breeze} */
 WORLD_ENTITY_MONSTER_BREEZE(WORLD_ENTITY_MONSTER, "breeze"),
 /** {@code net.minecraft.world.entity.monster.hoglin} */
Expand Down

60 changes: 57 additions & 3 deletions
...m/github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessorLegacy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -62,6 +63,19 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessorLegacy() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -257,13 +271,13 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -315,10 +329,50 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

60 changes: 57 additions & 3 deletions
...github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessor_v1_21_6.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -63,6 +64,19 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessor_v1_21_6() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -258,13 +272,13 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -316,10 +330,50 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

21 changes: 19 additions & 2 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/version/Version.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,25 @@ public static Version of(@NotNull String version) {
 if (dot1 < 0) {
 throw new IllegalArgumentException("Invalid Version: " + version);
 }
 int part1 = parseInt(version, 0, dot1, 10), part2 = parseInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2, 10);
 return of(part1, part2, dot2 >= 0 ? parseInt(version, dot2 + 1, version.length(), 10) : 0, qualifier);
 int part1 = parseLeadingInt(version, 0, dot1);
 int part2 = parseLeadingInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2);
 int part3 = dot2 >= 0 ? parseLeadingInt(version, dot2 + 1, version.length()) : 0;
 return of(part1, part2, part3, qualifier);
 }

 /**
 * 文字列の先頭から連続する数字を抽出して int に変換します。
 * 数字が1つも無い場合は0を返します。
 */
 private static int parseLeadingInt(@NotNull String s, int start, int end) {
 int actualEnd = start;
 while (actualEnd < end && Character.isDigit(s.charAt(actualEnd))) {
 actualEnd++;
 }
 if (actualEnd == start) {
 return 0;
 }
 return parseInt(s, start, actualEnd, 10);
 }

 @NotNull
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix versioncheck#66

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.

 Sign up for GitHub

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

 Open

HotWaterFlask
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix versioncheck
#66
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6ab71e7

Add files via upload


HotWaterFlask Aug 26, 2026
e9ac5ae

26.2support


HotWaterFlask Aug 26, 2026
841d802

Paper 26.2（Minecraft "Chaos Cubed" 更新）


HotWaterFlask Aug 26, 2026
148ae24

修复26.2 中 net.minecraft.resources.ResourceLocation 已被重命名为 net.minecraf…


HotWaterFlask Aug 26, 2026

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


2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.github.yuttyann</groupId>
 <artifactId>ScriptBlockPlus</artifactId>
 <version>2.3.4</version>
 <version>2.3.5</version>

 <name>ScriptBlockPlus</name>
 <url>https://github.com/yuttyann/ScriptBlockPlus</url>
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/server/NetMinecraft.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ public enum NetMinecraft implements SimpleReflection {
 WORLD_ENTITY_ITEM(WORLD_ENTITY, "item"),
 /** {@code net.minecraft.world.entity.monster} */
 WORLD_ENTITY_MONSTER(WORLD_ENTITY, "monster"),
 /** {@code net.minecraft.world.entity.monster.cubemob} */
 WORLD_ENTITY_MONSTER_CUBEMOB(WORLD_ENTITY_MONSTER, "cubemob"),
 /** {@code net.minecraft.world.entity.monster.breeze} */
 WORLD_ENTITY_MONSTER_BREEZE(WORLD_ENTITY_MONSTER, "breeze"),
 /** {@code net.minecraft.world.entity.monster.hoglin} */
Expand Down

60 changes: 57 additions & 3 deletions
...m/github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessorLegacy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -62,6 +63,19 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessorLegacy() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -257,13 +271,13 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -315,10 +329,50 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

60 changes: 57 additions & 3 deletions
...github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessor_v1_21_6.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -63,6 +64,19 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessor_v1_21_6() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -258,13 +272,13 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -316,10 +330,50 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

21 changes: 19 additions & 2 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/version/Version.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,25 @@ public static Version of(@NotNull String version) {
 if (dot1 < 0) {
 throw new IllegalArgumentException("Invalid Version: " + version);
 }
 int part1 = parseInt(version, 0, dot1, 10), part2 = parseInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2, 10);
 return of(part1, part2, dot2 >= 0 ? parseInt(version, dot2 + 1, version.length(), 10) : 0, qualifier);
 int part1 = parseLeadingInt(version, 0, dot1);
 int part2 = parseLeadingInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2);
 int part3 = dot2 >= 0 ? parseLeadingInt(version, dot2 + 1, version.length()) : 0;
 return of(part1, part2, part3, qualifier);
 }

 /**
 * 文字列の先頭から連続する数字を抽出して int に変換します。
 * 数字が1つも無い場合は0を返します。
 */
 private static int parseLeadingInt(@NotNull String s, int start, int end) {
 int actualEnd = start;
 while (actualEnd < end && Character.isDigit(s.charAt(actualEnd))) {
 actualEnd++;
 }
 if (actualEnd == start) {
 return 0;
 }
 return parseInt(s, start, actualEnd, 10);
 }

 @NotNull
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix versioncheck#66

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.

 Sign up for GitHub

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

 Open

HotWaterFlask
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix versioncheck
#66
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6ab71e7

Add files via upload


HotWaterFlask Aug 26, 2026
e9ac5ae

26.2support


HotWaterFlask Aug 26, 2026
841d802

Paper 26.2（Minecraft "Chaos Cubed" 更新）


HotWaterFlask Aug 26, 2026
148ae24

修复26.2 中 net.minecraft.resources.ResourceLocation 已被重命名为 net.minecraf…


HotWaterFlask Aug 26, 2026

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


2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.github.yuttyann</groupId>
 <artifactId>ScriptBlockPlus</artifactId>
 <version>2.3.4</version>
 <version>2.3.5</version>

 <name>ScriptBlockPlus</name>
 <url>https://github.com/yuttyann/ScriptBlockPlus</url>
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/server/NetMinecraft.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ public enum NetMinecraft implements SimpleReflection {
 WORLD_ENTITY_ITEM(WORLD_ENTITY, "item"),
 /** {@code net.minecraft.world.entity.monster} */
 WORLD_ENTITY_MONSTER(WORLD_ENTITY, "monster"),
 /** {@code net.minecraft.world.entity.monster.cubemob} */
 WORLD_ENTITY_MONSTER_CUBEMOB(WORLD_ENTITY_MONSTER, "cubemob"),
 /** {@code net.minecraft.world.entity.monster.breeze} */
 WORLD_ENTITY_MONSTER_BREEZE(WORLD_ENTITY_MONSTER, "breeze"),
 /** {@code net.minecraft.world.entity.monster.hoglin} */
Expand Down

60 changes: 57 additions & 3 deletions
...m/github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessorLegacy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -62,6 +63,19 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessorLegacy() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -257,13 +271,13 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -315,10 +329,50 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

60 changes: 57 additions & 3 deletions
...github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessor_v1_21_6.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -63,6 +64,19 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessor_v1_21_6() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -258,13 +272,13 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -316,10 +330,50 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

21 changes: 19 additions & 2 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/version/Version.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,25 @@ public static Version of(@NotNull String version) {
 if (dot1 < 0) {
 throw new IllegalArgumentException("Invalid Version: " + version);
 }
 int part1 = parseInt(version, 0, dot1, 10), part2 = parseInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2, 10);
 return of(part1, part2, dot2 >= 0 ? parseInt(version, dot2 + 1, version.length(), 10) : 0, qualifier);
 int part1 = parseLeadingInt(version, 0, dot1);
 int part2 = parseLeadingInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2);
 int part3 = dot2 >= 0 ? parseLeadingInt(version, dot2 + 1, version.length()) : 0;
 return of(part1, part2, part3, qualifier);
 }

 /**
 * 文字列の先頭から連続する数字を抽出して int に変換します。
 * 数字が1つも無い場合は0を返します。
 */
 private static int parseLeadingInt(@NotNull String s, int start, int end) {
 int actualEnd = start;
 while (actualEnd < end && Character.isDigit(s.charAt(actualEnd))) {
 actualEnd++;
 }
 if (actualEnd == start) {
 return 0;
 }
 return parseInt(s, start, actualEnd, 10);
 }

 @NotNull
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix versioncheck#66

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.

 Sign up for GitHub

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

 Open

HotWaterFlask
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix versioncheck
#66
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6ab71e7

Add files via upload


HotWaterFlask Aug 26, 2026
e9ac5ae

26.2support


HotWaterFlask Aug 26, 2026
841d802

Paper 26.2（Minecraft "Chaos Cubed" 更新）


HotWaterFlask Aug 26, 2026
148ae24

修复26.2 中 net.minecraft.resources.ResourceLocation 已被重命名为 net.minecraf…


HotWaterFlask Aug 26, 2026

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


2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.github.yuttyann</groupId>
 <artifactId>ScriptBlockPlus</artifactId>
 <version>2.3.4</version>
 <version>2.3.5</version>

 <name>ScriptBlockPlus</name>
 <url>https://github.com/yuttyann/ScriptBlockPlus</url>
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/server/NetMinecraft.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ public enum NetMinecraft implements SimpleReflection {
 WORLD_ENTITY_ITEM(WORLD_ENTITY, "item"),
 /** {@code net.minecraft.world.entity.monster} */
 WORLD_ENTITY_MONSTER(WORLD_ENTITY, "monster"),
 /** {@code net.minecraft.world.entity.monster.cubemob} */
 WORLD_ENTITY_MONSTER_CUBEMOB(WORLD_ENTITY_MONSTER, "cubemob"),
 /** {@code net.minecraft.world.entity.monster.breeze} */
 WORLD_ENTITY_MONSTER_BREEZE(WORLD_ENTITY_MONSTER, "breeze"),
 /** {@code net.minecraft.world.entity.monster.hoglin} */
Expand Down

60 changes: 57 additions & 3 deletions
...m/github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessorLegacy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -62,6 +63,19 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessorLegacy() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -257,13 +271,13 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -315,10 +329,50 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

60 changes: 57 additions & 3 deletions
...github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessor_v1_21_6.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -63,6 +64,19 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessor_v1_21_6() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -258,13 +272,13 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -316,10 +330,50 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

21 changes: 19 additions & 2 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/version/Version.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,25 @@ public static Version of(@NotNull String version) {
 if (dot1 < 0) {
 throw new IllegalArgumentException("Invalid Version: " + version);
 }
 int part1 = parseInt(version, 0, dot1, 10), part2 = parseInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2, 10);
 return of(part1, part2, dot2 >= 0 ? parseInt(version, dot2 + 1, version.length(), 10) : 0, qualifier);
 int part1 = parseLeadingInt(version, 0, dot1);
 int part2 = parseLeadingInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2);
 int part3 = dot2 >= 0 ? parseLeadingInt(version, dot2 + 1, version.length()) : 0;
 return of(part1, part2, part3, qualifier);
 }

 /**
 * 文字列の先頭から連続する数字を抽出して int に変換します。
 * 数字が1つも無い場合は0を返します。
 */
 private static int parseLeadingInt(@NotNull String s, int start, int end) {
 int actualEnd = start;
 while (actualEnd < end && Character.isDigit(s.charAt(actualEnd))) {
 actualEnd++;
 }
 if (actualEnd == start) {
 return 0;
 }
 return parseInt(s, start, actualEnd, 10);
 }

 @NotNull
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix versioncheck#66

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.

 Sign up for GitHub

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

 Open

HotWaterFlask
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix versioncheck
#66
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6ab71e7

Add files via upload


HotWaterFlask Aug 26, 2026
e9ac5ae

26.2support


HotWaterFlask Aug 26, 2026
841d802

Paper 26.2（Minecraft "Chaos Cubed" 更新）


HotWaterFlask Aug 26, 2026
148ae24

修复26.2 中 net.minecraft.resources.ResourceLocation 已被重命名为 net.minecraf…


HotWaterFlask Aug 26, 2026

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


2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.github.yuttyann</groupId>
 <artifactId>ScriptBlockPlus</artifactId>
 <version>2.3.4</version>
 <version>2.3.5</version>

 <name>ScriptBlockPlus</name>
 <url>https://github.com/yuttyann/ScriptBlockPlus</url>
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/server/NetMinecraft.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ public enum NetMinecraft implements SimpleReflection {
 WORLD_ENTITY_ITEM(WORLD_ENTITY, "item"),
 /** {@code net.minecraft.world.entity.monster} */
 WORLD_ENTITY_MONSTER(WORLD_ENTITY, "monster"),
 /** {@code net.minecraft.world.entity.monster.cubemob} */
 WORLD_ENTITY_MONSTER_CUBEMOB(WORLD_ENTITY_MONSTER, "cubemob"),
 /** {@code net.minecraft.world.entity.monster.breeze} */
 WORLD_ENTITY_MONSTER_BREEZE(WORLD_ENTITY_MONSTER, "breeze"),
 /** {@code net.minecraft.world.entity.monster.hoglin} */
Expand Down

60 changes: 57 additions & 3 deletions
...m/github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessorLegacy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -62,6 +63,19 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessorLegacy() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -257,13 +271,13 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -315,10 +329,50 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

60 changes: 57 additions & 3 deletions
...github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessor_v1_21_6.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -63,6 +64,19 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessor_v1_21_6() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -258,13 +272,13 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -316,10 +330,50 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

21 changes: 19 additions & 2 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/version/Version.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,25 @@ public static Version of(@NotNull String version) {
 if (dot1 < 0) {
 throw new IllegalArgumentException("Invalid Version: " + version);
 }
 int part1 = parseInt(version, 0, dot1, 10), part2 = parseInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2, 10);
 return of(part1, part2, dot2 >= 0 ? parseInt(version, dot2 + 1, version.length(), 10) : 0, qualifier);
 int part1 = parseLeadingInt(version, 0, dot1);
 int part2 = parseLeadingInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2);
 int part3 = dot2 >= 0 ? parseLeadingInt(version, dot2 + 1, version.length()) : 0;
 return of(part1, part2, part3, qualifier);
 }

 /**
 * 文字列の先頭から連続する数字を抽出して int に変換します。
 * 数字が1つも無い場合は0を返します。
 */
 private static int parseLeadingInt(@NotNull String s, int start, int end) {
 int actualEnd = start;
 while (actualEnd < end && Character.isDigit(s.charAt(actualEnd))) {
 actualEnd++;
 }
 if (actualEnd == start) {
 return 0;
 }
 return parseInt(s, start, actualEnd, 10);
 }

 @NotNull
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix versioncheck#66

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.

 Sign up for GitHub

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

 Open

HotWaterFlask
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix versioncheck
#66
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6ab71e7

Add files via upload


HotWaterFlask Aug 26, 2026
e9ac5ae

26.2support


HotWaterFlask Aug 26, 2026
841d802

Paper 26.2（Minecraft "Chaos Cubed" 更新）


HotWaterFlask Aug 26, 2026
148ae24

修复26.2 中 net.minecraft.resources.ResourceLocation 已被重命名为 net.minecraf…


HotWaterFlask Aug 26, 2026

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


2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.github.yuttyann</groupId>
 <artifactId>ScriptBlockPlus</artifactId>
 <version>2.3.4</version>
 <version>2.3.5</version>

 <name>ScriptBlockPlus</name>
 <url>https://github.com/yuttyann/ScriptBlockPlus</url>
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/server/NetMinecraft.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,8 @@ public enum NetMinecraft implements SimpleReflection {
 WORLD_ENTITY_ITEM(WORLD_ENTITY, "item"),
 /** {@code net.minecraft.world.entity.monster} */
 WORLD_ENTITY_MONSTER(WORLD_ENTITY, "monster"),
 /** {@code net.minecraft.world.entity.monster.cubemob} */
 WORLD_ENTITY_MONSTER_CUBEMOB(WORLD_ENTITY_MONSTER, "cubemob"),
 /** {@code net.minecraft.world.entity.monster.breeze} */
 WORLD_ENTITY_MONSTER_BREEZE(WORLD_ENTITY_MONSTER, "breeze"),
 /** {@code net.minecraft.world.entity.monster.hoglin} */
Expand Down

60 changes: 57 additions & 3 deletions
...m/github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessorLegacy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -62,6 +63,19 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessorLegacy() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -257,13 +271,13 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -315,10 +329,50 @@ public class PaperRemappedAccessorLegacy implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

60 changes: 57 additions & 3 deletions
...github/yuttyann/scriptblockplus/utils/server/minecraft/PaperRemappedAccessor_v1_21_6.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import static org.apache.commons.lang3.ArrayUtils.*;
import static org.apache.commons.lang3.math.NumberUtils.*;

import java.lang.reflect.InvocationTargetException;
import java.util.List;

import org.bukkit.Bukkit;
Expand DownExpand Up@@ -63,6 +64,19 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 private final Object blockPosZero;
 private final Object magmaCubeType;

 /**
 * ゲームバージョンに応じた MagmaCube クラスを取得します。
 * <p>
 * 26.2 以降は {@code net.minecraft.world.entity.monster.cubemob} パッケージに移動されました。
 */
 private static Class<?> getMagmaCubeClass() {
 try {
 return WORLD_ENTITY_MONSTER.getClass("MagmaCube");
 } catch (IllegalArgumentException e) {
 return WORLD_ENTITY_MONSTER_CUBEMOB.getClass("MagmaCube");
 }
 }

 PaperRemappedAccessor_v1_21_6() throws ReflectiveOperationException {
 // sendPacket
 field(SERVER_LEVEL.getClass("ServerPlayer"))
Expand DownExpand Up@@ -258,13 +272,13 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 .findFirst("ContainerMenu.checkReachable");

 // newMagmaCube
 construct(WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 construct(getMagmaCubeClass())
 .parameterTypes(WORLD_ENTITY.getClass("EntityType"), WORLD_LEVEL.getClass("Level"))
 .findFirst("MagmaCube");

 // newCraftMagmaCube
 construct(ENTITY.getClass("CraftMagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), WORLD_ENTITY_MONSTER.getClass("MagmaCube"))
 .parameterTypes(CRAFTBUKKIT.getClass("CraftServer"), getMagmaCubeClass())
 .findFirst("CraftMagmaCube");

 // newClientboundSetEntityDataPacket
Expand DownExpand Up@@ -316,10 +330,50 @@ public class PaperRemappedAccessor_v1_21_6 implements NativeAccessor {
 this.m = methods();
 this.c = constructs();
 this.blockPosZero = c.newInstance("BlockPos", INT_ARRAY_ZERO_3);
 this.magmaCubeType = field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE").fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 this.magmaCubeType = getMagmaCubeType();
 this.unknownReason = Enum.valueOf((Class) Utils.getClassForName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"), "UNKNOWN");
 }

 /**
 * ゲームバージョンに応じた MagmaCube の {@code EntityType} を取得します。
 * <p>
 * 26.x では {@code EntityType.MAGMA_CUBE} の静的フィールドが廃止され、
 * {@code BuiltInRegistries.ENTITY_TYPE} のレジストリから取得する必要があります。
 */
 private static Object getMagmaCubeType() throws ReflectiveOperationException {
 // 1. EntityType.MAGMA_CUBE 静的フィールド（1.21.x 以前）
 try {
 return field(WORLD_ENTITY.getClass("EntityType")).modifiers(STATIC).name("MAGMA_CUBE")
 .fieldType(WORLD_ENTITY.getClass("EntityType")).findFirst().get(null);
 } catch (NullPointerException ignored) { }

 // 2. BuiltInRegistries.ENTITY_TYPE レジストリから取得（1.21.11+ / 26.x）
 try {
 var builtInRegistriesClass = Utils.getClassForName("net.minecraft.core.registries.BuiltInRegistries");
 var registry = builtInRegistriesClass.getField("ENTITY_TYPE").get(null);
 Class<?> identifierClass;
 try {
 // 1.21.11 以降は ResourceLocation が Identifier に改名された
 identifierClass = Utils.getClassForName("net.minecraft.resources.Identifier");
 } catch (IllegalArgumentException ignored) {
 identifierClass = Utils.getClassForName("net.minecraft.resources.ResourceLocation");
 }
 var parseMethod = identifierClass.getMethod("parse", String.class);
 var magmaCubeKey = parseMethod.invoke(null, "minecraft:magma_cube");
 var getValueMethod = registry.getClass().getMethod("getValue", identifierClass);
 return getValueMethod.invoke(registry, magmaCubeKey);
 } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InvocationTargetException ignored) { }

 // 3. CraftEntityType.bukkitToMinecraft から取得
 try {
 var craftEntityTypeClass = Utils.getClassForName("org.bukkit.craftbukkit.entity.CraftEntityType");
 var bukkitToMinecraft = craftEntityTypeClass.getMethod("bukkitToMinecraft", org.bukkit.entity.EntityType.class);
 return bukkitToMinecraft.invoke(null, org.bukkit.entity.EntityType.MAGMA_CUBE);
 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }

 throw new ReflectiveOperationException("Could not resolve EntityType for MagmaCube");
 }

 @Override
 public void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
 var temp = new Object[] { packet };
Expand Down

21 changes: 19 additions & 2 deletions
src/main/java/com/github/yuttyann/scriptblockplus/utils/version/Version.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,25 @@ public static Version of(@NotNull String version) {
 if (dot1 < 0) {
 throw new IllegalArgumentException("Invalid Version: " + version);
 }
 int part1 = parseInt(version, 0, dot1, 10), part2 = parseInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2, 10);
 return of(part1, part2, dot2 >= 0 ? parseInt(version, dot2 + 1, version.length(), 10) : 0, qualifier);
 int part1 = parseLeadingInt(version, 0, dot1);
 int part2 = parseLeadingInt(version, dot1 + 1, dot2 < 0 ? version.length() : dot2);
 int part3 = dot2 >= 0 ? parseLeadingInt(version, dot2 + 1, version.length()) : 0;
 return of(part1, part2, part3, qualifier);
 }

 /**
 * 文字列の先頭から連続する数字を抽出して int に変換します。
 * 数字が1つも無い場合は0を返します。
 */
 private static int parseLeadingInt(@NotNull String s, int start, int end) {
 int actualEnd = start;
 while (actualEnd < end && Character.isDigit(s.charAt(actualEnd))) {
 actualEnd++;
 }
 if (actualEnd == start) {
 return 0;
 }
 return parseInt(s, start, actualEnd, 10);
 }

 @NotNull
Expand Down