Skip to content

Commit 909187e

Browse files
tal5tal5
committed
26.1 part 4: handle obfuscation removal
1 parent b336d97 commit 909187e

18 files changed

Lines changed: 61 additions & 207 deletions

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/ReflectionMappingsInfo.java‎

Lines changed: 0 additions & 130 deletions
This file was deleted.

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/BlockHelperImpl.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.denizenscript.denizen.nms.interfaces.BlockHelper;
44
import com.denizenscript.denizen.nms.util.PlayerProfile;
55
import com.denizenscript.denizen.nms.v26_1.Handler;
6-
import com.denizenscript.denizen.nms.v26_1.ReflectionMappingsInfo;
76
import com.denizenscript.denizen.nms.v26_1.impl.ProfileEditorImpl;
87
import com.denizenscript.denizen.objects.EntityTag;
98
import com.denizenscript.denizencore.objects.Mechanism;
@@ -131,7 +130,7 @@ public boolean setBlockResistance(Material material, float resistance) {
131130
if (block == null) {
132131
return false;
133132
}
134-
ReflectionHelper.setFieldValue(net.minecraft.world.level.block.state.BlockBehaviour.class, ReflectionMappingsInfo.BlockBehaviour_explosionResistance, block, resistance);
133+
ReflectionHelper.setFieldValue(net.minecraft.world.level.block.state.BlockBehaviour.class, "explosionResistance", block, resistance);
135134
return true;
136135
}
137136

@@ -141,7 +140,7 @@ public float getBlockResistance(Material material) {
141140
if (block == null) {
142141
return 0;
143142
}
144-
return ReflectionHelper.getFieldValue(net.minecraft.world.level.block.state.BlockBehaviour.class, ReflectionMappingsInfo.BlockBehaviour_explosionResistance, block);
143+
return ReflectionHelper.getFieldValue(net.minecraft.world.level.block.state.BlockBehaviour.class, "explosionResistance", block);
145144
}
146145

147146
public static final MethodHandle MATERIAL_PUSH_REACTION_SETTER = ReflectionHelper.getFinalSetterForFirstOfType(BlockBehaviour.BlockStateBase.class, PushReaction.class);

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/EnchantmentHelperImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
public class EnchantmentHelperImpl extends EnchantmentHelper {
66
// TODO: 1.21: Enchantments were entirely reworked, need to update this
77
/*
8-
public static final Field REGISTRY_FROZEN = ReflectionHelper.getFields(MappedRegistry.class).get(ReflectionMappingsInfo.MappedRegistry_frozen, boolean.class);
9-
public static final Field REGISTRY_INTRUSIVE_HOLDERS = ReflectionHelper.getFields(MappedRegistry.class).get(ReflectionMappingsInfo.MappedRegistry_unregisteredIntrusiveHolders, Map.class);
8+
public static final Field REGISTRY_FROZEN = ReflectionHelper.getFields(MappedRegistry.class).get("frozen", boolean.class);
9+
public static final Field REGISTRY_INTRUSIVE_HOLDERS = ReflectionHelper.getFields(MappedRegistry.class).get("unregisteredIntrusiveHolders", Map.class);
1010
1111
@Override
1212
public org.bukkit.enchantments.Enchantment registerFakeEnchantment(EnchantmentScriptContainer.EnchantmentReference script) {

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/EntityHelperImpl.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.denizenscript.denizen.nms.NMSHandler;
55
import com.denizenscript.denizen.nms.interfaces.EntityHelper;
66
import com.denizenscript.denizen.nms.v26_1.Handler;
7-
import com.denizenscript.denizen.nms.v26_1.ReflectionMappingsInfo;
87
import com.denizenscript.denizen.nms.v26_1.impl.network.handlers.DenizenNetworkManagerImpl;
98
import com.denizenscript.denizen.objects.EntityTag;
109
import com.denizenscript.denizen.objects.properties.entity.EntityState;
@@ -92,9 +91,9 @@
9291

9392
public class EntityHelperImpl extends EntityHelper {
9493

95-
public static final MethodHandle ENTITY_ONGROUND_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.world.entity.Entity.class, ReflectionMappingsInfo.Entity_onGround, boolean.class);
94+
public static final MethodHandle ENTITY_ONGROUND_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.world.entity.Entity.class, "onGround", boolean.class);
9695

97-
public static final EntityDataAccessor<Boolean> ENDERMAN_DATA_ACCESSOR_SCREAMING = ReflectionHelper.getFieldValue(EnderMan.class, ReflectionMappingsInfo.EnderMan_DATA_CREEPY, null);
96+
public static final EntityDataAccessor<Boolean> ENDERMAN_DATA_ACCESSOR_SCREAMING = ReflectionHelper.getFieldValue(EnderMan.class, "DATA_CREEPY", null);
9897

9998
@Override
10099
public void setInvisible(Entity entity, boolean invisible) {
@@ -152,8 +151,8 @@ public double getDamageTo(LivingEntity attacker, Entity target) {
152151
return damage;
153152
}
154153

155-
public static final MethodHandle LIVINGENTITY_AUTOSPINATTACK_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.world.entity.LivingEntity.class, ReflectionMappingsInfo.LivingEntity_autoSpinAttackTicks);
156-
public static final MethodHandle LIVINGENTITY_SETLIVINGENTITYFLAG = ReflectionHelper.getMethodHandle(net.minecraft.world.entity.LivingEntity.class, ReflectionMappingsInfo.LivingEntity_setLivingEntityFlag_method, int.class, boolean.class);
154+
public static final MethodHandle LIVINGENTITY_AUTOSPINATTACK_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.world.entity.LivingEntity.class, "autoSpinAttackTicks");
155+
public static final MethodHandle LIVINGENTITY_SETLIVINGENTITYFLAG = ReflectionHelper.getMethodHandle(net.minecraft.world.entity.LivingEntity.class, "setLivingEntityFlag", int.class, boolean.class);
157156

158157
@Override
159158
public void setRiptide(Entity entity, boolean state) {
@@ -548,7 +547,7 @@ public void setBoundingBox(Entity entity, BoundingBox box) {
548547
((CraftEntity) entity).getHandle().setBoundingBox(new AABB(box.getMinX(), box.getMinY(), box.getMinZ(), box.getMaxX(), box.getMaxY(), box.getMaxZ()));
549548
}
550549

551-
public static final Field EXPERIENCE_ORB_AGE = ReflectionHelper.getFields(net.minecraft.world.entity.ExperienceOrb.class).get(ReflectionMappingsInfo.ExperienceOrb_age, int.class);
550+
public static final Field EXPERIENCE_ORB_AGE = ReflectionHelper.getFields(net.minecraft.world.entity.ExperienceOrb.class).get("age", int.class);
552551

553552
@Override
554553
public void setTicksLived(Entity entity, int ticks) {
@@ -687,7 +686,7 @@ public EntityTag getMobSpawnerDisplayEntity(CreatureSpawner spawner) {
687686
return new EntityTag(nmsEntity.getBukkitEntity());
688687
}
689688

690-
public static final Field ZOMBIE_INWATERTIME = ReflectionHelper.getFields(net.minecraft.world.entity.monster.zombie.Zombie.class).get(ReflectionMappingsInfo.Zombie_inWaterTime, int.class);
689+
public static final Field ZOMBIE_INWATERTIME = ReflectionHelper.getFields(net.minecraft.world.entity.monster.zombie.Zombie.class).get("inWaterTime", int.class);
691690

692691
@Override
693692
public int getInWaterTime(Zombie zombie) {
@@ -767,7 +766,7 @@ public void setUUID(Entity entity, UUID id) {
767766
}
768767
}
769768

770-
public static final Field SynchedEntityData_itemsById = ReflectionHelper.getFields(SynchedEntityData.class).get(ReflectionMappingsInfo.SynchedEntityData_itemsById);
769+
public static final Field SynchedEntityData_itemsById = ReflectionHelper.getFields(SynchedEntityData.class).get("itemsById");
771770

772771
public static Int2ObjectMap<SynchedEntityData.DataItem<Object>> getDataItems(Entity entity) {
773772
try {

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/FishingHelperImpl.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.denizenscript.denizen.nms.v26_1.helpers;
22

33
import com.denizenscript.denizen.nms.interfaces.FishingHelper;
4-
import com.denizenscript.denizen.nms.v26_1.ReflectionMappingsInfo;
54
import com.denizenscript.denizencore.utilities.ReflectionHelper;
65
import com.denizenscript.denizencore.utilities.debugging.Debug;
76
import net.minecraft.resources.ResourceKey;
@@ -97,9 +96,9 @@ private ItemStack catchRandomFish(FishingHook fishHook) {
9796
return getRandomReward(fishHook, BuiltInLootTables.FISHING_FISH);
9897
}
9998

100-
public static final Field FISHING_HOOK_NIBBLE = ReflectionHelper.getFields(FishingHook.class).get(ReflectionMappingsInfo.FishingHook_nibble, int.class);
101-
public static final Field FISHING_HOOK_LURE_TIME = ReflectionHelper.getFields(FishingHook.class).get(ReflectionMappingsInfo.FishingHook_timeUntilLured, int.class);
102-
public static final Field FISHING_HOOK_HOOK_TIME = ReflectionHelper.getFields(FishingHook.class).get(ReflectionMappingsInfo.FishingHook_timeUntilHooked, int.class);
99+
public static final Field FISHING_HOOK_NIBBLE = ReflectionHelper.getFields(FishingHook.class).get("nibble", int.class);
100+
public static final Field FISHING_HOOK_LURE_TIME = ReflectionHelper.getFields(FishingHook.class).get("timeUntilLured", int.class);
101+
public static final Field FISHING_HOOK_HOOK_TIME = ReflectionHelper.getFields(FishingHook.class).get("timeUntilHooked", int.class);
103102

104103
@Override
105104
public FishHook getHookFrom(Player player) {

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/ItemHelperImpl.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.denizenscript.denizen.nms.interfaces.ItemHelper;
55
import com.denizenscript.denizen.nms.util.PlayerProfile;
66
import com.denizenscript.denizen.nms.v26_1.Handler;
7-
import com.denizenscript.denizen.nms.v26_1.ReflectionMappingsInfo;
87
import com.denizenscript.denizen.nms.v26_1.impl.ProfileEditorImpl;
98
import com.denizenscript.denizen.objects.ItemTag;
109
import com.denizenscript.denizen.objects.properties.item.ItemComponentsPatch;
@@ -102,7 +101,7 @@ public static net.minecraft.world.item.crafting.RecipeHolder<?> getNMSRecipe(Nam
102101
return ((CraftServer) Bukkit.getServer()).getServer().getRecipeManager().byKey(nmsKey).orElse(null);
103102
}
104103

105-
public static final Field Item_components = ReflectionHelper.getFields(Item.class).get(ReflectionMappingsInfo.Item_components, DataComponentMap.class);
104+
public static final Field Item_components = ReflectionHelper.getFields(Item.class).get("components", DataComponentMap.class);
106105

107106
public static final Field RecipeManager_featureFlagSet = ReflectionHelper.getFields(RecipeManager.class).getFirstOfType(FeatureFlagSet.class);
108107

@@ -484,7 +483,7 @@ public ItemStack setRawComponentsPatch(ItemStack item, MapTag rawComponentsMap,
484483
return CraftItemStack.asBukkitCopy(nmsItemStack);
485484
}
486485

487-
public static final Field AdventureModePredicate_predicates = ReflectionHelper.getFields(AdventureModePredicate.class).get(ReflectionMappingsInfo.AdventureModePredicate_predicates);
486+
public static final Field AdventureModePredicate_predicates = ReflectionHelper.getFields(AdventureModePredicate.class).get("predicates");
488487

489488
@Override
490489
public List<Material> getCanPlaceOn(ItemStack item) {

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/PacketHelperImpl.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.denizenscript.denizen.nms.NMSHandler;
44
import com.denizenscript.denizen.nms.interfaces.PacketHelper;
55
import com.denizenscript.denizen.nms.v26_1.Handler;
6-
import com.denizenscript.denizen.nms.v26_1.ReflectionMappingsInfo;
76
import com.denizenscript.denizen.nms.v26_1.impl.SidebarImpl;
87
import com.denizenscript.denizen.nms.v26_1.impl.network.handlers.DenizenNetworkManagerImpl;
98
import com.denizenscript.denizen.objects.LocationTag;
@@ -32,9 +31,9 @@
3231
import net.minecraft.world.entity.Relative;
3332
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
3433
import net.minecraft.world.entity.ai.attributes.Attributes;
35-
import net.minecraft.world.entity.monster.spider.CaveSpider;
3634
import net.minecraft.world.entity.monster.Creeper;
3735
import net.minecraft.world.entity.monster.EnderMan;
36+
import net.minecraft.world.entity.monster.spider.CaveSpider;
3837
import net.minecraft.world.entity.monster.spider.Spider;
3938
import net.minecraft.world.inventory.AbstractContainerMenu;
4039
import net.minecraft.world.level.block.Block;
@@ -71,19 +70,19 @@
7170

7271
public class PacketHelperImpl implements PacketHelper {
7372

74-
public static final EntityDataAccessor<Float> PLAYER_DATA_ACCESSOR_ABSORPTION = ReflectionHelper.getFieldValue(net.minecraft.world.entity.player.Player.class, ReflectionMappingsInfo.Player_DATA_PLAYER_ABSORPTION_ID, null);
73+
public static final EntityDataAccessor<Float> PLAYER_DATA_ACCESSOR_ABSORPTION = ReflectionHelper.getFieldValue(net.minecraft.world.entity.player.Player.class, "DATA_PLAYER_ABSORPTION_ID", null);
7574

76-
public static final EntityDataAccessor<Byte> ENTITY_DATA_ACCESSOR_FLAGS = ReflectionHelper.getFieldValue(net.minecraft.world.entity.Entity.class, ReflectionMappingsInfo.Entity_DATA_SHARED_FLAGS_ID, null);
75+
public static final EntityDataAccessor<Byte> ENTITY_DATA_ACCESSOR_FLAGS = ReflectionHelper.getFieldValue(net.minecraft.world.entity.Entity.class, "DATA_SHARED_FLAGS_ID", null);
7776

78-
public static final MethodHandle ABILITIES_PACKET_FOV_SETTER = ReflectionHelper.getFinalSetter(ClientboundPlayerAbilitiesPacket.class, ReflectionMappingsInfo.ClientboundPlayerAbilitiesPacket_walkingSpeed);
77+
public static final MethodHandle ABILITIES_PACKET_FOV_SETTER = ReflectionHelper.getFinalSetter(ClientboundPlayerAbilitiesPacket.class, "walkingSpeed");
7978

8079
public static final Field ENTITY_TRACKER_ENTRY_GETTER = ReflectionHelper.getFields(ChunkMap.TrackedEntity.class).getFirstOfType(ServerEntity.class);
8180

8281
public static final MethodHandle CANVAS_GET_BUFFER = ReflectionHelper.getMethodHandle(CraftMapCanvas.class, "getBuffer");
8382
public static final Field MAPVIEW_WORLDMAP = ReflectionHelper.getFields(CraftMapView.class).get("worldMap");
8483

85-
public static final EntityDataAccessor<Optional<Component>> ENTITY_DATA_ACCESSOR_CUSTOM_NAME = ReflectionHelper.getFieldValue(net.minecraft.world.entity.Entity.class, ReflectionMappingsInfo.Entity_DATA_CUSTOM_NAME, null);
86-
public static final EntityDataAccessor<Boolean> ENTITY_DATA_ACCESSOR_CUSTOM_NAME_VISIBLE = ReflectionHelper.getFieldValue(net.minecraft.world.entity.Entity.class, ReflectionMappingsInfo.Entity_DATA_CUSTOM_NAME_VISIBLE, null);
84+
public static final EntityDataAccessor<Optional<Component>> ENTITY_DATA_ACCESSOR_CUSTOM_NAME = ReflectionHelper.getFieldValue(net.minecraft.world.entity.Entity.class, "DATA_CUSTOM_NAME", null);
85+
public static final EntityDataAccessor<Boolean> ENTITY_DATA_ACCESSOR_CUSTOM_NAME_VISIBLE = ReflectionHelper.getFieldValue(net.minecraft.world.entity.Entity.class, "DATA_CUSTOM_NAME_VISIBLE", null);
8786

8887
@Override
8988
public void setFakeAbsorption(Player player, float value) {

0 commit comments

Comments
 (0)