Skip to content

Commit 047b40e

Browse files
EvModderEvModder
committed
changes to support 1.21.11
1 parent 95ce838 commit 047b40e

23 files changed

Lines changed: 72 additions & 157 deletions

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ org.gradle.parallel=true
44
org.gradle.configuration-cache=false
55

66
# https://fabricmc.net/develop
7-
minecraft_version=1.21.8
8-
yarn_mappings=1.21.8+build.1
9-
loader_version=0.17.2
7+
minecraft_version=1.21.11
8+
yarn_mappings=1.21.11+build.4
9+
loader_version=0.18.4
1010
loom_version=1.14-SNAPSHOT
1111

12-
fabric_api_version=0.136.1+1.21.8
12+
fabric_api_version=0.141.1+1.21.11
1313

1414
# https://github.com/LlamaLad7/MixinExtras
1515
#mixinextras_version=0.5.2
1616

1717
# https://jitpack.io/com/github/sakura-ryoko/malilib/
18-
malilib_version=0.25.7
18+
malilib_version=0.27.2
1919

2020

2121
# Export

‎src/main/java/net/evmodder/evmod/apis/EpearlActivator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ public BlockHitResult getHitResult(MinecraftClient client, BlockPos pos){
7979
}
8080

8181
private BlockPos findNearestPearlWithOwnerName(MinecraftClient client, String name){
82-
final Vec3d playerPos = client.player.getPos();
82+
final Vec3d playerPos = client.player.getEyePos();
8383
double closestDistSq = Double.MAX_VALUE;
8484
Vec3d closestPos = null;
8585
for(EnderPearlEntity pearl : client.world.getEntitiesByClass(EnderPearlEntity.class,
8686
client.player.getBoundingBox().expand(REACH, REACH, REACH),
8787
pearl->name.equalsIgnoreCase(epearlLookup.getOwnerName(pearl)))
8888
){
89-
final double distSq = pearl.getPos().squaredDistanceTo(playerPos);
90-
if(distSq < closestDistSq){closestDistSq = distSq; closestPos = pearl.getPos();}
89+
final double distSq = pearl.getEntityPos().squaredDistanceTo(playerPos);
90+
if(distSq < closestDistSq){closestDistSq = distSq; closestPos = pearl.getEntityPos();}
9191
}
9292
return BlockPos.ofFloored(closestPos);
9393
}

‎src/main/java/net/evmodder/evmod/apis/MapClickMoveNeighbors.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public static void moveNeighbors(PlayerEntity player, int destSlot, ItemStack ma
3737
final ItemStack[] slots = player.currentScreenHandler.slots.stream().map(Slot::getStack).toArray(ItemStack[]::new);
3838
final String movedName = mapMoved.getCustomName().getLiteralString();
3939
final MapIdComponent mapId = mapMoved.get(DataComponentTypes.MAP_ID);
40-
final MapState state = mapId == null ? null : player.getWorld().getMapState(mapId);
40+
final MapState state = mapId == null ? null : player.getEntityWorld().getMapState(mapId);
4141
final Boolean locked = state == null ? null : state.locked;
4242
//Main.LOGGER.info("MapMoveClick: locked="+locked);
43-
final RelatedMapsData data = MapRelationUtils.getRelatedMapsByName(Arrays.asList(slots), movedName, mapMoved.getCount(), locked, player.getWorld());
43+
final RelatedMapsData data = MapRelationUtils.getRelatedMapsByName(Arrays.asList(slots), movedName, mapMoved.getCount(), locked, player.getEntityWorld());
4444
if(data.prefixLen() == -1){
4545
Main.LOGGER.info("MapMoveClick: related-name maps not found");
4646
return;
@@ -72,8 +72,8 @@ public static void moveNeighbors(PlayerEntity player, int destSlot, ItemStack ma
7272
if(state == null){++w; br += 1;}
7373
else{
7474
final byte[] colors = state.colors;
75-
final byte[] tlColors = getColors(player.getWorld(), slots[tl]);
76-
final byte[] brColors = getColors(player.getWorld(), slots[br]);
75+
final byte[] tlColors = getColors(player.getEntityWorld(), slots[tl]);
76+
final byte[] brColors = getColors(player.getEntityWorld(), slots[br]);
7777
int scoreLeft = -2, scoreRight = -2, scoreTop = -2, scoreBottom = -2;
7878
if(h == 1){
7979
scoreLeft = (tl%9==0||destSlot%9+w>8) ? -2 : MapRelationUtils.adjacentEdgeScore(colors, tlColors, true);

‎src/main/java/net/evmodder/evmod/apis/MojangProfileLookup.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ public class MojangProfileLookup{
2020
ClientPlayNetworkHandler networkHandler = client.getNetworkHandler();
2121
if(networkHandler != null){
2222
PlayerListEntry entry = networkHandler.getPlayerListEntry(key);
23-
if(entry != null) return entry.getProfile().getName();
23+
if(entry != null) return entry.getProfile().name();
2424
}
2525
return null;
2626
}
2727
@Override protected String load(UUID key){
2828
//Main.LOGGER.info("oof, web request D:");
29-
ProfileResult pr = client.getSessionService().fetchProfile(key, /*requireSecure=*/false);
30-
if(pr == null || pr.profile() == null || pr.profile().getName() == null){
29+
ProfileResult pr = client.getApiServices().sessionService().fetchProfile(key, /*requireSecure=*/false);
30+
if(pr == null || pr.profile() == null || pr.profile().name() == null){
3131
Main.LOGGER.error("Unable to find name for player UUID: "+key.toString());
3232
return NAME_404;
3333
}
3434
else{
35-
uuidLookup.putIfAbsent(pr.profile().getName().toLowerCase(), key);
36-
return pr.profile().getName();
35+
uuidLookup.putIfAbsent(pr.profile().name().toLowerCase(), key);
36+
return pr.profile().name();
3737
}
3838
}
3939
};
@@ -43,7 +43,7 @@ public class MojangProfileLookup{
4343
ClientPlayNetworkHandler networkHandler = client.getNetworkHandler();
4444
if(networkHandler != null){
4545
for(PlayerListEntry entry : networkHandler.getPlayerList()){
46-
if(entry.getProfile().getName().equalsIgnoreCase(key)) return entry.getProfile().getId();
46+
if(entry.getProfile().name().equalsIgnoreCase(key)) return entry.getProfile().id();
4747
}
4848
}
4949
return null;

‎src/main/java/net/evmodder/evmod/commands/CommandAssignPearl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public class CommandAssignPearl{
6969
private int assignPearl(CommandContext<FabricClientCommandSource> ctx){
7070
final Entity player = ctx.getSource().getPlayer();
7171
final Box box = player.getBoundingBox().expand(8, 6, 8);
72-
List<EnderPearlEntity> epearls = player.getWorld().getEntitiesByType(EntityType.ENDER_PEARL, box, e->{
72+
List<EnderPearlEntity> epearls = player.getEntityWorld().getEntitiesByType(EntityType.ENDER_PEARL, box, e->{
7373
return MiscUtils.isLookingAt(e, player) && !epearlLookup.isLoadedOwnerName(epearlLookup.getOwnerName(e));
7474
});
7575
if(epearls.isEmpty()){
@@ -92,7 +92,7 @@ private int assignPearl(CommandContext<FabricClientCommandSource> ctx){
9292
ctx.getSource().sendError(Text.literal("Epearl disappeared while fetching player UUID!"));
9393
return;
9494
}
95-
((AccessorProjectileEntity)epearl).setOwnerUUID(new LazyEntityReference<Entity>(uuid));
95+
((AccessorProjectileEntity)epearl).setOwnerUUID(LazyEntityReference.ofUUID(uuid));
9696
epearlLookup.getOwnerName(epearl);
9797
ctx.getSource().sendFeedback(Text.literal("Assigned owner for epearl: "+epearl.getUuidAsString()+" <- "+name));
9898
});

‎src/main/java/net/evmodder/evmod/commands/CommandExportMapImg.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,9 @@ private List<ItemFrameEntity> getConnectedFrames(Map<Vec3i, ItemFrameEntity> ife
341341
}
342342

343343
private List<ItemFrameEntity> getItemFramesWithMaps(ClientPlayerEntity player){
344-
Box everythingBox = Box.of(player.getPos(), RENDER_DIST, RENDER_DIST, RENDER_DIST);
344+
Box everythingBox = Box.of(player.getEntityPos(), RENDER_DIST, RENDER_DIST, RENDER_DIST);
345345

346-
return player.getWorld().getEntitiesByType(TypeFilter.instanceOf(ItemFrameEntity.class), everythingBox,
346+
return player.getEntityWorld().getEntitiesByType(TypeFilter.instanceOf(ItemFrameEntity.class), everythingBox,
347347
e -> e.getHeldItemStack().getItem() == Items.FILLED_MAP);
348348
}
349349

@@ -581,9 +581,9 @@ private Set<String> getNearbyMapNames(ClientPlayerEntity player){
581581
List<ItemStack> mapItems = mapWall.stream().map(ife -> ife.getHeldItemStack()).collect(Collectors.toCollection(LinkedList::new));
582582
while(!mapItems.isEmpty()){
583583
final String name = mapItems.getFirst().getCustomName().getString();
584-
final MapState state = FilledMapItem.getMapState(mapItems.getFirst(), player.getWorld());
584+
final MapState state = FilledMapItem.getMapState(mapItems.getFirst(), player.getEntityWorld());
585585
final Boolean locked = state == null ? null : state.locked;
586-
RelatedMapsData data = MapRelationUtils.getRelatedMapsByName(mapItems, name, 1, locked, player.getWorld());
586+
RelatedMapsData data = MapRelationUtils.getRelatedMapsByName(mapItems, name, 1, locked, player.getEntityWorld());
587587
final String nameKey = getCleanedName(name, data);
588588
if(!SHOW_ONLY_IF_HAS_AZ || nameKey.matches(".*[a-zA-Z].*")) cmdMapNames.put(nameKey, name);
589589
// assert data.slots().size() > 0; // Can be size=0 for mismatched pos data

‎src/main/java/net/evmodder/evmod/keybinds/KeybindEbounceTravelHelper.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ private boolean fillHighwayHole(String useBlock){
156156
// Block block = ((BlockItem)client.player.getStackInHand(hand).getItem()).getBlock();
157157
// if(!useBlock.isInstance(block)) return false;
158158

159-
Vec3d vec = client.player.getPos().add(client.player.getVelocity()).add(0, -0.75, 0);
159+
Vec3d vec = client.player.getEntityPos().add(client.player.getVelocity()).add(0, -0.75, 0);
160160

161-
Vec3d pos = client.player.getPos();
161+
Vec3d pos = client.player.getEntityPos();
162162
if(aheadDist != 0 && !client.world.getBlockState(client.player.getBlockPos().down())
163163
.getCollisionShape(client.world, client.player.getBlockPos()).isEmpty()) {
164164
Vec3d dir = Vec3d.fromPolar(0, client.player.getYaw()).multiply(aheadDist, 0, aheadDist);
@@ -175,7 +175,7 @@ private boolean fillHighwayHole(String useBlock){
175175
BlockPos targetBlock = bp.toImmutable();
176176

177177
if(getPlaceSide(bp) == null){
178-
pos = client.player.getPos();
178+
pos = client.player.getEntityPos();
179179
pos = pos.add(0, -0.98f, 0);
180180
pos.add(client.player.getVelocity());
181181

@@ -209,7 +209,7 @@ private boolean fillHighwayHole(String useBlock){
209209

210210
private Vec3d getEyesPos(){
211211
float eyeHeight = client.player.getEyeHeight(client.player.getPose());
212-
return client.player.getPos().add(0, eyeHeight, 0);
212+
return client.player.getEntityPos().add(0, eyeHeight, 0);
213213
}
214214
private Direction getBlockBreakingSide(BlockPos bp){
215215
Vec3d eyes = getEyesPos();
@@ -299,7 +299,7 @@ private boolean putOutFireAndMineObstacles(){
299299
if(client.player.lastX != client.player.getX() || client.player.lastZ != client.player.getZ()) return false;
300300

301301
ArrayList<BlockPos> mineSpots = new ArrayList<>();
302-
Vec3d pos = client.player.getPos();
302+
Vec3d pos = client.player.getEntityPos();
303303
if(pos.getY() > targetY) pos = new Vec3d(pos.x, targetY, pos.z);
304304
if(dx != 0){
305305
mineSpots.add(bp.add(dx, 0, 0));

‎src/main/java/net/evmodder/evmod/keybinds/KeybindMapLoad.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public final void loadMapArtFromContainer(){
178178

179179
if(hs instanceof InventoryScreen){loadMapArtFromBundles(); return;}
180180
final DefaultedList<Slot> slots = hs.getScreenHandler().slots;
181-
if(slots.stream().noneMatch(s -> isUnloadedMapArt(client.player.clientWorld, s.getStack()))){
181+
if(slots.stream().noneMatch(s -> isUnloadedMapArt(client.player.getEntityWorld(), s.getStack()))){
182182
Main.LOGGER.warn("MapLoad cancelled: none to load");
183183
return;
184184
}
@@ -192,7 +192,7 @@ public final void loadMapArtFromContainer(){
192192

193193
int hbi = 0;
194194
for(int i=0; i<slots.size(); ++i){
195-
if(!isUnloadedMapArt(client.player.clientWorld, slots.get(i).getStack())) continue;
195+
if(!isUnloadedMapArt(client.player.getEntityWorld(), slots.get(i).getStack())) continue;
196196
if(!mapIdsToLoad.add(slots.get(i).getStack().get(DataComponentTypes.MAP_ID).id())) continue;
197197
clicks.add(new InvAction(i, hbButtons[hbi], ActionType.HOTBAR_SWAP));
198198
putBackSlots[hbi] = i;

‎src/main/java/net/evmodder/evmod/keybinds/KeybindMapMove.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import net.evmodder.evmod.apis.ClickUtils.InvAction;
1616
import net.evmodder.evmod.apis.MapRelationUtils.RelatedMapsData;
1717
import net.minecraft.client.MinecraftClient;
18-
import net.minecraft.client.gui.screen.Screen;
1918
import net.minecraft.client.gui.screen.ingame.HandledScreen;
2019
import net.minecraft.item.FilledMapItem;
2120
import net.minecraft.item.ItemStack;
@@ -115,7 +114,7 @@ else if(stack.getItem() == Items.FILLED_MAP){
115114
if(numInShulk == 0 && cantMergeIntoShulk > emptySlotsShulk){Main.LOGGER.warn("MapMove cancelled: Not enough empty slots in shulker"); return;}
116115

117116
final boolean moveToShulk = numInShulk == 0 || cantMergeIntoInv > emptySlotsInv || (numInInv == numInShulk && cantMergeIntoShulk == 0);
118-
final boolean isShiftClick = Screen.hasShiftDown();
117+
final boolean isShiftClick = false;//TODO: Screen.hasShiftDown();
119118
final boolean selectiveMove = !isShiftClick && (moveToShulk
120119
? (countsInInv.size() == 2 && cantMergeIntoShulk == 0)
121120
: (countsInShulk.size() == 2 && smallerSlotsAtStart && (cantMergeIntoInv == 0 || numInInv == 0)));

‎src/main/java/net/evmodder/evmod/keybinds/KeybindMapMoveBundle.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import net.evmodder.evmod.apis.ClickUtils.ActionType;
1212
import net.evmodder.evmod.apis.ClickUtils.InvAction;
1313
import net.minecraft.client.MinecraftClient;
14-
import net.minecraft.client.gui.screen.Screen;
1514
import net.minecraft.client.gui.screen.ingame.CraftingScreen;
1615
import net.minecraft.client.gui.screen.ingame.HandledScreen;
1716
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
@@ -62,7 +61,8 @@ public final void moveMapArtToFromBundle(final boolean reverse){
6261
final boolean pickupHalf = slotsWithMapArt.length > 0
6362
&& Arrays.stream(slotsWithMapArt).anyMatch(i -> slots[i].getCount() == 2)
6463
&& Arrays.stream(slotsWithMapArt).allMatch(i -> slots[i].getCount() <= 2)
65-
&& (!Screen.hasShiftDown() || Arrays.stream(slotsWithMapArt).noneMatch(i -> slots[i].getCount() == 1));
64+
;
65+
// TODO && (!Screen.hasShiftDown() || Arrays.stream(slotsWithMapArt).noneMatch(i -> slots[i].getCount() == 1));
6666
final boolean anyArtToPickup = Arrays.stream(slotsWithMapArt).anyMatch(i -> slots[i].getCount() == (pickupHalf ? 2 : 1));
6767

6868
// Main.LOGGER.info("MapBundleOp: begin bundle search");

0 commit comments

Comments
 (0)