Skip to content

Commit 6f11ac9

Browse files
committed
imports + obfuscation changes
1 parent fb02dae commit 6f11ac9

2 files changed

Lines changed: 4 additions & 17 deletions

File tree

worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_5/PaperweightAdapter.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import com.google.common.util.concurrent.Futures;
2929
import com.mojang.serialization.Codec;
3030
import com.mojang.serialization.Lifecycle;
31-
import com.sk89q.worldedit.EditSession;
32-
import com.sk89q.worldedit.MaxChangedBlocksException;
3331
import com.sk89q.worldedit.WorldEditException;
3432
import com.sk89q.worldedit.blocks.BaseItem;
3533
import com.sk89q.worldedit.blocks.BaseItemStack;
@@ -45,10 +43,6 @@
4543
import com.sk89q.worldedit.math.BlockVector2;
4644
import com.sk89q.worldedit.math.BlockVector3;
4745
import com.sk89q.worldedit.regions.Region;
48-
import com.sk89q.worldedit.registry.state.BooleanProperty;
49-
import com.sk89q.worldedit.registry.state.DirectionalProperty;
50-
import com.sk89q.worldedit.registry.state.EnumProperty;
51-
import com.sk89q.worldedit.registry.state.IntegerProperty;
5246
import com.sk89q.worldedit.registry.state.Property;
5347
import com.sk89q.worldedit.util.Direction;
5448
import com.sk89q.worldedit.util.SideEffect;
@@ -75,7 +69,6 @@
7569
import net.minecraft.core.Holder;
7670
import net.minecraft.core.HolderSet;
7771
import net.minecraft.core.Registry;
78-
import net.minecraft.core.SectionPos;
7972
import net.minecraft.core.component.DataComponentPatch;
8073
import net.minecraft.core.registries.Registries;
8174
import net.minecraft.nbt.ByteArrayTag;
@@ -104,7 +97,6 @@
10497
import net.minecraft.server.level.ServerLevel;
10598
import net.minecraft.server.level.progress.ChunkProgressListener;
10699
import net.minecraft.util.RandomSource;
107-
import net.minecraft.util.StringRepresentable;
108100
import net.minecraft.util.thread.BlockableEventLoop;
109101
import net.minecraft.world.Clearable;
110102
import net.minecraft.world.InteractionHand;
@@ -128,10 +120,6 @@
128120
import net.minecraft.world.level.chunk.status.ChunkStatus;
129121
import net.minecraft.world.level.dimension.LevelStem;
130122
import net.minecraft.world.level.levelgen.WorldOptions;
131-
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
132-
import net.minecraft.world.level.levelgen.structure.BoundingBox;
133-
import net.minecraft.world.level.levelgen.structure.Structure;
134-
import net.minecraft.world.level.levelgen.structure.StructureStart;
135123
import net.minecraft.world.level.storage.LevelStorageSource;
136124
import net.minecraft.world.level.storage.PrimaryLevelData;
137125
import net.minecraft.world.phys.BlockHitResult;
@@ -179,7 +167,6 @@
179167
import java.util.Collection;
180168
import java.util.HashMap;
181169
import java.util.List;
182-
import java.util.Locale;
183170
import java.util.Map;
184171
import java.util.Objects;
185172
import java.util.OptionalInt;

worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightPlatformAdapter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,16 +185,16 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
185185
PAPER_CHUNK_GEN_ALL_ENTITIES.setAccessible(true);
186186
} catch (NoSuchMethodException ignored) {
187187
// Non-Paper
188-
SERVER_LEVEL_ENTITY_MANAGER = ServerLevel.class.getDeclaredField(Refraction.pickName("entityManager", "N"));
188+
SERVER_LEVEL_ENTITY_MANAGER = ServerLevel.class.getDeclaredField(Refraction.pickName("entityManager", "O"));
189189
SERVER_LEVEL_ENTITY_MANAGER.setAccessible(true);
190190
}
191191

192-
Method palettedContaienrGet = PalettedContainer.class.getDeclaredMethod(
192+
Method palettedContainerGet = PalettedContainer.class.getDeclaredMethod(
193193
Refraction.pickName("get", "a"),
194194
int.class
195195
);
196-
palettedContaienrGet.setAccessible(true);
197-
PALETTED_CONTAINER_GET = lookup.unreflect(palettedContaienrGet);
196+
palettedContainerGet.setAccessible(true);
197+
PALETTED_CONTAINER_GET = lookup.unreflect(palettedContainerGet);
198198
} catch (RuntimeException | Error e) {
199199
throw e;
200200
} catch (Exception e) {

0 commit comments

Comments
 (0)