Skip to content

Commit c8f1984

Browse files
SirYwellSirYwell
authored
Simplify NMSAdapter#createPalette methods (#3036)
1 parent 0cf9813 commit c8f1984

File tree

16 files changed

+170
-219
lines changed

16 files changed

+170
-219
lines changed

‎worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightFaweAdapter.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,17 @@ public BukkitImplAdapter<net.minecraft.nbt.Tag> getParent() {
147147
}
148148

149149
private synchronized boolean init() {
150-
if (ibdToStateOrdinal != null && ibdToStateOrdinal[1] != 0) {
150+
if (ibdToOrdinal != null && ibdToOrdinal[1] != 0) {
151151
return false;
152152
}
153-
ibdToStateOrdinal = new char[BlockTypesCache.states.length]; // size
154-
ordinalToIbdID = new int[ibdToStateOrdinal.length]; // size
155-
for (int i = 0; i < ibdToStateOrdinal.length; i++) {
153+
ibdToOrdinal = new int[BlockTypesCache.states.length]; // size
154+
ordinalToIbdID = new int[ibdToOrdinal.length]; // size
155+
for (int i = 0; i < ibdToOrdinal.length; i++) {
156156
BlockState blockState = BlockTypesCache.states[i];
157157
PaperweightBlockMaterial material = (PaperweightBlockMaterial) blockState.getMaterial();
158158
int id = Block.BLOCK_STATE_REGISTRY.getId(material.getState());
159159
char ordinal = blockState.getOrdinalChar();
160-
ibdToStateOrdinal[id] = ordinal;
160+
ibdToOrdinal[id] = ordinal;
161161
ordinalToIbdID[ordinal] = id;
162162
}
163163
Map<String, List<Property<?>>> properties = new HashMap<>();
@@ -365,18 +365,18 @@ public BlockState adapt(net.minecraft.world.level.block.state.BlockState blockSt
365365
public char adaptToChar(net.minecraft.world.level.block.state.BlockState blockState) {
366366
int id = Block.BLOCK_STATE_REGISTRY.getId(blockState);
367367
if (initialised) {
368-
return ibdToStateOrdinal[id];
368+
return (char) ibdToOrdinal[id];
369369
}
370370
synchronized (this) {
371371
if (initialised) {
372-
return ibdToStateOrdinal[id];
372+
return (char) ibdToOrdinal[id];
373373
}
374374
try {
375375
init();
376-
return ibdToStateOrdinal[id];
376+
return (char) ibdToOrdinal[id];
377377
} catch (ArrayIndexOutOfBoundsException e1) {
378-
LOGGER.error("Attempted to convert {} with ID {} to char. ibdToStateOrdinal length: {}. Defaulting to air!",
379-
blockState.getBlock(), Block.BLOCK_STATE_REGISTRY.getId(blockState), ibdToStateOrdinal.length, e1
378+
LOGGER.error("Attempted to convert {} with ID {} to char. ibdToOrdinal length: {}. Defaulting to air!",
379+
blockState.getBlock(), Block.BLOCK_STATE_REGISTRY.getId(blockState), ibdToOrdinal.length, e1
380380
);
381381
return BlockTypesCache.ReservedIDs.AIR;
382382
}
@@ -385,28 +385,28 @@ public char adaptToChar(net.minecraft.world.level.block.state.BlockState blockSt
385385

386386
public char ibdIDToOrdinal(int id) {
387387
if (initialised) {
388-
return ibdToStateOrdinal[id];
388+
return (char) ibdToOrdinal[id];
389389
}
390390
synchronized (this) {
391391
if (initialised) {
392-
return ibdToStateOrdinal[id];
392+
return (char) ibdToOrdinal[id];
393393
}
394394
init();
395-
return ibdToStateOrdinal[id];
395+
return (char) ibdToOrdinal[id];
396396
}
397397
}
398398

399399
@Override
400-
public char[] getIbdToStateOrdinal() {
400+
protected int[] getIbdToOrdinal() {
401401
if (initialised) {
402-
return ibdToStateOrdinal;
402+
return ibdToOrdinal;
403403
}
404404
synchronized (this) {
405405
if (initialised) {
406-
return ibdToStateOrdinal;
406+
return ibdToOrdinal;
407407
}
408408
init();
409-
return ibdToStateOrdinal;
409+
return ibdToOrdinal;
410410
}
411411
}
412412

‎worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightPlatformAdapter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
import java.util.concurrent.Semaphore;
8383
import java.util.concurrent.TimeUnit;
8484
import java.util.concurrent.TimeoutException;
85-
import java.util.function.Function;
85+
import java.util.function.IntFunction;
8686

8787
import static java.lang.invoke.MethodType.methodType;
8888
import static net.minecraft.core.registries.Registries.BIOME;
@@ -420,7 +420,7 @@ public static LevelChunkSection newChunkSection(
420420

421421
public static LevelChunkSection newChunkSection(
422422
final int layer,
423-
final Function<Integer, char[]> get,
423+
final IntFunction<char[]> get,
424424
char[] set,
425425
CachedBukkitAdapter adapter,
426426
Registry<Biome> biomeRegistry,
@@ -436,9 +436,9 @@ public static LevelChunkSection newChunkSection(
436436
try {
437437
int num_palette;
438438
if (get == null) {
439-
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, null);
439+
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
440440
} else {
441-
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, null);
441+
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
442442
}
443443

444444
int bitsPerEntry = MathMan.log2nlz(num_palette - 1);

‎worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightFaweAdapter.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -146,17 +146,17 @@ public BukkitImplAdapter<net.minecraft.nbt.Tag> getParent() {
146146
}
147147

148148
private synchronized boolean init() {
149-
if (ibdToStateOrdinal != null && ibdToStateOrdinal[1] != 0) {
149+
if (ibdToOrdinal != null && ibdToOrdinal[1] != 0) {
150150
return false;
151151
}
152-
ibdToStateOrdinal = new char[BlockTypesCache.states.length]; // size
153-
ordinalToIbdID = new int[ibdToStateOrdinal.length]; // size
154-
for (int i = 0; i < ibdToStateOrdinal.length; i++) {
152+
ibdToOrdinal = new int[BlockTypesCache.states.length]; // size
153+
ordinalToIbdID = new int[ibdToOrdinal.length]; // size
154+
for (int i = 0; i < ibdToOrdinal.length; i++) {
155155
BlockState blockState = BlockTypesCache.states[i];
156156
PaperweightBlockMaterial material = (PaperweightBlockMaterial) blockState.getMaterial();
157157
int id = Block.BLOCK_STATE_REGISTRY.getId(material.getState());
158158
char ordinal = blockState.getOrdinalChar();
159-
ibdToStateOrdinal[id] = ordinal;
159+
ibdToOrdinal[id] = ordinal;
160160
ordinalToIbdID[ordinal] = id;
161161
}
162162
Map<String, List<Property<?>>> properties = new HashMap<>();
@@ -364,18 +364,18 @@ public BlockState adapt(net.minecraft.world.level.block.state.BlockState blockSt
364364
public char adaptToChar(net.minecraft.world.level.block.state.BlockState blockState) {
365365
int id = Block.BLOCK_STATE_REGISTRY.getId(blockState);
366366
if (initialised) {
367-
return ibdToStateOrdinal[id];
367+
return (char) ibdToOrdinal[id];
368368
}
369369
synchronized (this) {
370370
if (initialised) {
371-
return ibdToStateOrdinal[id];
371+
return (char) ibdToOrdinal[id];
372372
}
373373
try {
374374
init();
375-
return ibdToStateOrdinal[id];
375+
return (char) ibdToOrdinal[id];
376376
} catch (ArrayIndexOutOfBoundsException e1) {
377-
LOGGER.error("Attempted to convert {} with ID {} to char. ibdToStateOrdinal length: {}. Defaulting to air!",
378-
blockState.getBlock(), Block.BLOCK_STATE_REGISTRY.getId(blockState), ibdToStateOrdinal.length, e1
377+
LOGGER.error("Attempted to convert {} with ID {} to char. ibdToOrdinal length: {}. Defaulting to air!",
378+
blockState.getBlock(), Block.BLOCK_STATE_REGISTRY.getId(blockState), ibdToOrdinal.length, e1
379379
);
380380
return BlockTypesCache.ReservedIDs.AIR;
381381
}
@@ -384,28 +384,28 @@ public char adaptToChar(net.minecraft.world.level.block.state.BlockState blockSt
384384

385385
public char ibdIDToOrdinal(int id) {
386386
if (initialised) {
387-
return ibdToStateOrdinal[id];
387+
return (char) ibdToOrdinal[id];
388388
}
389389
synchronized (this) {
390390
if (initialised) {
391-
return ibdToStateOrdinal[id];
391+
return (char) ibdToOrdinal[id];
392392
}
393393
init();
394-
return ibdToStateOrdinal[id];
394+
return (char) ibdToOrdinal[id];
395395
}
396396
}
397397

398398
@Override
399-
public char[] getIbdToStateOrdinal() {
399+
public int[] getIbdToOrdinal() {
400400
if (initialised) {
401-
return ibdToStateOrdinal;
401+
return ibdToOrdinal;
402402
}
403403
synchronized (this) {
404404
if (initialised) {
405-
return ibdToStateOrdinal;
405+
return ibdToOrdinal;
406406
}
407407
init();
408-
return ibdToStateOrdinal;
408+
return ibdToOrdinal;
409409
}
410410
}
411411

‎worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightPlatformAdapter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
import java.util.concurrent.Semaphore;
8383
import java.util.concurrent.TimeUnit;
8484
import java.util.concurrent.TimeoutException;
85-
import java.util.function.Function;
85+
import java.util.function.IntFunction;
8686

8787
import static java.lang.invoke.MethodType.methodType;
8888
import static net.minecraft.core.registries.Registries.BIOME;
@@ -420,7 +420,7 @@ public static LevelChunkSection newChunkSection(
420420

421421
public static LevelChunkSection newChunkSection(
422422
final int layer,
423-
final Function<Integer, char[]> get,
423+
final IntFunction<char[]> get,
424424
char[] set,
425425
CachedBukkitAdapter adapter,
426426
Registry<Biome> biomeRegistry,
@@ -436,9 +436,9 @@ public static LevelChunkSection newChunkSection(
436436
try {
437437
int num_palette;
438438
if (get == null) {
439-
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, null);
439+
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
440440
} else {
441-
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, null);
441+
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
442442
}
443443

444444
int bitsPerEntry = MathMan.log2nlz(num_palette - 1);

‎worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightFaweAdapter.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,17 @@ public BukkitImplAdapter<net.minecraft.nbt.Tag> getParent() {
156156
}
157157

158158
private synchronized boolean init() {
159-
if (ibdToStateOrdinal != null && ibdToStateOrdinal[1] != 0) {
159+
if (ibdToOrdinal != null && ibdToOrdinal[1] != 0) {
160160
return false;
161161
}
162-
ibdToStateOrdinal = new char[BlockTypesCache.states.length]; // size
163-
ordinalToIbdID = new int[ibdToStateOrdinal.length]; // size
164-
for (int i = 0; i < ibdToStateOrdinal.length; i++) {
162+
ibdToOrdinal = new int[BlockTypesCache.states.length]; // size
163+
ordinalToIbdID = new int[ibdToOrdinal.length]; // size
164+
for (int i = 0; i < ibdToOrdinal.length; i++) {
165165
BlockState blockState = BlockTypesCache.states[i];
166166
PaperweightBlockMaterial material = (PaperweightBlockMaterial) blockState.getMaterial();
167167
int id = Block.BLOCK_STATE_REGISTRY.getId(material.getState());
168168
char ordinal = blockState.getOrdinalChar();
169-
ibdToStateOrdinal[id] = ordinal;
169+
ibdToOrdinal[id] = ordinal;
170170
ordinalToIbdID[ordinal] = id;
171171
}
172172
Map<String, List<Property<?>>> properties = new HashMap<>();
@@ -374,18 +374,18 @@ public BlockState adapt(net.minecraft.world.level.block.state.BlockState blockSt
374374
public char adaptToChar(net.minecraft.world.level.block.state.BlockState blockState) {
375375
int id = Block.BLOCK_STATE_REGISTRY.getId(blockState);
376376
if (initialised) {
377-
return ibdToStateOrdinal[id];
377+
return (char) ibdToOrdinal[id];
378378
}
379379
synchronized (this) {
380380
if (initialised) {
381-
return ibdToStateOrdinal[id];
381+
return (char) ibdToOrdinal[id];
382382
}
383383
try {
384384
init();
385-
return ibdToStateOrdinal[id];
385+
return (char) ibdToOrdinal[id];
386386
} catch (ArrayIndexOutOfBoundsException e1) {
387-
LOGGER.error("Attempted to convert {} with ID {} to char. ibdToStateOrdinal length: {}. Defaulting to air!",
388-
blockState.getBlock(), Block.BLOCK_STATE_REGISTRY.getId(blockState), ibdToStateOrdinal.length, e1
387+
LOGGER.error("Attempted to convert {} with ID {} to char. ibdToOrdinal length: {}. Defaulting to air!",
388+
blockState.getBlock(), Block.BLOCK_STATE_REGISTRY.getId(blockState), ibdToOrdinal.length, e1
389389
);
390390
return BlockTypesCache.ReservedIDs.AIR;
391391
}
@@ -394,28 +394,28 @@ public char adaptToChar(net.minecraft.world.level.block.state.BlockState blockSt
394394

395395
public char ibdIDToOrdinal(int id) {
396396
if (initialised) {
397-
return ibdToStateOrdinal[id];
397+
return (char) ibdToOrdinal[id];
398398
}
399399
synchronized (this) {
400400
if (initialised) {
401-
return ibdToStateOrdinal[id];
401+
return (char) ibdToOrdinal[id];
402402
}
403403
init();
404-
return ibdToStateOrdinal[id];
404+
return (char) ibdToOrdinal[id];
405405
}
406406
}
407407

408408
@Override
409-
public char[] getIbdToStateOrdinal() {
409+
public int[] getIbdToOrdinal() {
410410
if (initialised) {
411-
return ibdToStateOrdinal;
411+
return ibdToOrdinal;
412412
}
413413
synchronized (this) {
414414
if (initialised) {
415-
return ibdToStateOrdinal;
415+
return ibdToOrdinal;
416416
}
417417
init();
418-
return ibdToStateOrdinal;
418+
return ibdToOrdinal;
419419
}
420420
}
421421

‎worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightPlatformAdapter.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.fastasyncworldedit.core.math.IntPair;
1111
import com.fastasyncworldedit.core.util.MathMan;
1212
import com.fastasyncworldedit.core.util.TaskManager;
13-
import com.mojang.datafixers.util.Either;
1413
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
1514
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
1615
import com.sk89q.worldedit.bukkit.adapter.Refraction;
@@ -77,12 +76,11 @@
7776
import java.util.LinkedList;
7877
import java.util.List;
7978
import java.util.Map;
80-
import java.util.Optional;
8179
import java.util.concurrent.CompletableFuture;
8280
import java.util.concurrent.Semaphore;
8381
import java.util.concurrent.TimeUnit;
8482
import java.util.concurrent.TimeoutException;
85-
import java.util.function.Function;
83+
import java.util.function.IntFunction;
8684

8785
import static java.lang.invoke.MethodType.methodType;
8886
import static net.minecraft.core.registries.Registries.BIOME;
@@ -415,7 +413,7 @@ public static LevelChunkSection newChunkSection(
415413

416414
public static LevelChunkSection newChunkSection(
417415
final int layer,
418-
final Function<Integer, char[]> get,
416+
final IntFunction<char[]> get,
419417
char[] set,
420418
CachedBukkitAdapter adapter,
421419
Registry<Biome> biomeRegistry,
@@ -431,9 +429,9 @@ public static LevelChunkSection newChunkSection(
431429
try {
432430
int num_palette;
433431
if (get == null) {
434-
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, null);
432+
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
435433
} else {
436-
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, null);
434+
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
437435
}
438436

439437
int bitsPerEntry = MathMan.log2nlz(num_palette - 1);

0 commit comments

Comments
 (0)