Skip to content

Commit e5b6680

Browse files
TexBlockTexBlock
committed
clean
1 parent e2a4018 commit e5b6680

51 files changed

Lines changed: 530 additions & 106 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/dev/latvian/mods/kubejs/client/KeybindRegistryKubeEvent.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.mojang.blaze3d.platform.InputConstants;
44
import dev.latvian.mods.kubejs.plugin.builtin.wrapper.GLFWInputWrapper;
55
import dev.latvian.mods.rhino.util.HideFromJS;
6-
import net.minecraft.client.KeyMapping;
7-
import net.neoforged.neoforge.client.settings.KeyConflictContext;
8-
import net.neoforged.neoforge.client.settings.KeyModifier;
6+
import me.textrue.kubejs.fabric.helper.key.KeyMappingHelper;
7+
import me.textrue.kubejs.fabric.thirdparty.settings.KeyConflictContext;
8+
import me.textrue.kubejs.fabric.thirdparty.settings.KeyModifier;
99

1010
import java.util.ArrayList;
1111
import java.util.List;
@@ -84,7 +84,7 @@ public Builder category(String category) {
8484
@HideFromJS
8585
public KubeJSKeybinds.KubeKey create() {
8686
var key = KubeJSKeybinds.getOrCreate(id);
87-
key.mapping = new KeyMapping("key.kubejs.%s".formatted(id), keyConflictContext, modifier, inputType, defaultKey, category);
87+
key.mapping = KeyMappingHelper.create(category, "key.kubejs.%s".formatted(id), inputType).setContext(keyConflictContext).setModifier(modifier).build(defaultKey).getMapping();
8888
return key;
8989
}
9090
}

‎src/main/java/dev/latvian/mods/kubejs/client/KubeJSModClientEventHandler.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.latvian.mods.kubejs.client;
22

3+
import com.mojang.blaze3d.platform.InputConstants;
34
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
45
import dev.latvian.mods.kubejs.KubeJS;
56
import dev.latvian.mods.kubejs.block.BlockBuilder;
@@ -22,7 +23,7 @@
2223
import dev.latvian.mods.kubejs.util.ID;
2324
import dev.latvian.mods.kubejs.web.LocalWebServer;
2425
import dev.latvian.mods.kubejs.web.WebServerProperties;
25-
import me.textrue.kubejs.fabric.helper.key.KeyMappingBuilder;
26+
import me.textrue.kubejs.fabric.helper.key.KeyMappingHelper;
2627
import me.textrue.kubejs.fabric.thirdparty.events.AddPackFindersEvent;
2728
import me.textrue.kubejs.fabric.thirdparty.fluids.BaseFlowingFluid;
2829
import me.textrue.kubejs.fabric.thirdparty.fluids.extensions.ClientFluidTypeExtensions;
@@ -139,7 +140,7 @@ public static void registerRenderers() {
139140
}
140141

141142
public static void registerKeyMappings() {
142-
KeyBindingHelper.registerKeyBinding(HighlightRenderer.keyMapping = KeyMappingBuilder.create("key.categories.kubejs", "key.kubejs.kubedex").setContext(KeyConflictContext.UNIVERSAL).setModifier(KeyModifier.NONE).buildKeyboardKey(GLFW.GLFW_KEY_K).getMapping());
143+
KeyBindingHelper.registerKeyBinding(HighlightRenderer.keyMapping = KeyMappingHelper.create("key.categories.kubejs", "key.kubejs.kubedex", InputConstants.Type.KEYSYM).setContext(KeyConflictContext.UNIVERSAL).setModifier(KeyModifier.NONE).build(GLFW.GLFW_KEY_K).getMapping());
143144

144145
var kubeEvent = new KeybindRegistryKubeEvent();
145146
KeyBindEvents.REGISTRY.post(kubeEvent);

‎src/main/java/dev/latvian/mods/kubejs/client/highlight/HighlightRenderer.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap;
2121
import it.unimi.dsi.fastutil.objects.Reference2IntMap;
2222
import me.textrue.kubejs.fabric.helper.NetworkHelper;
23+
import me.textrue.kubejs.fabric.thirdparty.mixin.client.accessors.AbstractContainerScreenAccessor;
24+
import me.textrue.kubejs.fabric.thirdparty.util.RenderTypeHelper;
2325
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
2426
import net.minecraft.CrashReport;
2527
import net.minecraft.CrashReportCategory;
@@ -51,8 +53,6 @@
5153
import net.minecraft.world.phys.BlockHitResult;
5254
import net.minecraft.world.phys.EntityHitResult;
5355
import net.minecraft.world.phys.HitResult;
54-
import net.neoforged.neoforge.client.RenderTypeHelper;
55-
import net.neoforged.neoforge.client.model.data.ModelData;
5656
import org.apache.commons.lang3.mutable.MutableBoolean;
5757
import org.jetbrains.annotations.Nullable;
5858
import org.joml.Matrix4f;
@@ -418,8 +418,8 @@ public void renderAfterEntities(Minecraft mc, WorldRenderContext context) {
418418

419419
var bufferSource = sources.get(entry.getIntValue());
420420

421-
for (var renderType : model.getRenderTypes(state, RandomSource.create(seed), ModelData.EMPTY)) {
422-
mc.getBlockRenderer().getModelRenderer().tesselateBlock(mc.level, model, state, pos, ms, bufferSource.getBuffer(RenderTypeHelper.getMovingBlockRenderType(renderType)), false, RandomSource.create(), seed, OverlayTexture.NO_OVERLAY, ModelData.EMPTY, renderType);
421+
for (var renderType : model.getRenderTypes(state, RandomSource.create(seed))) {
422+
mc.getBlockRenderer().getModelRenderer().tesselateBlock(mc.level, model, state, pos, ms, bufferSource.getBuffer(RenderTypeHelper.getMovingBlockRenderType(renderType)), false, RandomSource.create(), seed, OverlayTexture.NO_OVERLAY);
423423
}
424424

425425
var entity = mc.level.getBlockEntity(pos);
@@ -515,8 +515,8 @@ public void screen(Minecraft mc, GuiGraphics graphics, AbstractContainerScreen<?
515515
var menu = screen.getMenu();
516516

517517
for (var slot : menu.slots) {
518-
int sx = slot.x + screen.getGuiLeft();
519-
int sy = slot.y + screen.getGuiTop();
518+
int sx = slot.x + ((AbstractContainerScreenAccessor) screen).getLeftPos();
519+
int sy = slot.y + ((AbstractContainerScreenAccessor) screen).getTopPos();
520520

521521
if (mx >= sx && mx < sx + 16 && my >= sy && my < sy + 16 && slot.hasItem()) {
522522
hoveredSlots.add(slot);
@@ -534,8 +534,8 @@ public void screen(Minecraft mc, GuiGraphics graphics, AbstractContainerScreen<?
534534
var bufferSource = new WrappedMultiBufferSource(mc.renderBuffers().bufferSource(), color.kjs$getRGB());
535535

536536
for (var slot : hoveredSlots) {
537-
int x = slot.x + screen.getGuiLeft();
538-
int y = slot.y + screen.getGuiTop();
537+
int x = slot.x + ((AbstractContainerScreenAccessor) screen).getLeftPos();
538+
int y = slot.y + ((AbstractContainerScreenAccessor) screen).getTopPos();
539539
var stack = slot.getItem();
540540

541541
var model = mc.getItemRenderer().getModel(stack, mc.level, mc.player, 0);

‎src/main/java/dev/latvian/mods/kubejs/command/DumpCommands.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import dev.latvian.mods.kubejs.typings.Info;
1010
import dev.latvian.mods.kubejs.util.UtilsJS;
1111
import dev.latvian.mods.rhino.JavaMembers;
12-
import me.textrue.kubejs.fabric.thirdparty.mixin.MinecraftServerAccessor;
12+
import me.textrue.kubejs.fabric.thirdparty.mixin.accessors.MinecraftServerAccessor;
1313
import net.minecraft.commands.CommandSourceStack;
1414
import net.minecraft.core.Registry;
1515
import net.minecraft.network.chat.Component;
@@ -26,6 +26,7 @@ public class DumpCommands {
2626
private static final char UNICODE_TICK = '✔';
2727
private static final char UNICODE_CROSS = '✘';
2828

29+
@SuppressWarnings("removal")
2930
public static int events(CommandSourceStack source) {
3031
var groups = EventGroups.ALL.get().map();
3132

‎src/main/java/dev/latvian/mods/kubejs/command/KubeJSCommands.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import dev.latvian.mods.kubejs.util.JsonUtils;
3030
import dev.latvian.mods.kubejs.web.LocalWebServer;
3131
import me.textrue.kubejs.fabric.helper.NetworkHelper;
32-
import me.textrue.kubejs.fabric.thirdparty.mixin.MinecraftServerAccessor;
32+
import me.textrue.kubejs.fabric.thirdparty.mixin.accessors.MinecraftServerAccessor;
3333
import net.fabricmc.loader.api.FabricLoader;
3434
import net.minecraft.ChatFormatting;
3535
import net.minecraft.commands.CommandSourceStack;

‎src/main/java/dev/latvian/mods/kubejs/core/ServerPlayerKJS.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import dev.latvian.mods.kubejs.player.PlayerStatsJS;
1212
import dev.latvian.mods.kubejs.util.NotificationToastData;
1313
import dev.latvian.mods.rhino.util.RemapPrefixForJS;
14+
import me.textrue.kubejs.fabric.helper.NetworkHelper;
1415
import net.minecraft.nbt.CompoundTag;
1516
import net.minecraft.network.chat.Component;
1617
import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket;
@@ -26,7 +27,6 @@
2627
import net.minecraft.world.inventory.AbstractContainerMenu;
2728
import net.minecraft.world.item.ItemStack;
2829
import net.minecraft.world.level.GameType;
29-
import net.neoforged.neoforge.network.PacketDistributor;
3030
import org.jetbrains.annotations.Nullable;
3131

3232
import java.util.Date;
@@ -44,7 +44,7 @@ public interface ServerPlayerKJS extends PlayerKJS {
4444
@Override
4545
default void kjs$sendData(String channel, @Nullable CompoundTag data) {
4646
if (!channel.isEmpty()) {
47-
PacketDistributor.sendToPlayer(kjs$self(), new SendDataFromServerPayload(channel, data));
47+
NetworkHelper.sendToPlayer(kjs$self(), new SendDataFromServerPayload(channel, data));
4848
}
4949
}
5050

@@ -150,7 +150,7 @@ public interface ServerPlayerKJS extends PlayerKJS {
150150

151151
@Override
152152
default void kjs$notify(NotificationToastData builder) {
153-
PacketDistributor.sendToPlayer(kjs$self(), new NotificationPayload(builder));
153+
NetworkHelper.sendToPlayer(kjs$self(), new NotificationPayload(builder));
154154
}
155155

156156
default void kjs$openChestGUI(Consumer<KubeJSGUI> gui) {
@@ -167,7 +167,7 @@ public Component getDisplayName() {
167167
public AbstractContainerMenu createMenu(int i, Inventory inventory, Player player) {
168168
return new KubeJSMenu(i, inventory, data);
169169
}
170-
}, data::write);
170+
});
171171
}
172172

173173
default void kjs$openInventoryGUI(InventoryKJS inventory, Component title) {
@@ -256,6 +256,6 @@ public AbstractContainerMenu createMenu(int i, Inventory inventory, Player playe
256256

257257
@Override
258258
default void kjs$setActivePostShader(@Nullable ResourceLocation id) {
259-
PacketDistributor.sendToPlayer(kjs$self(), new SetActivePostShaderPayload(Optional.ofNullable(id)));
259+
NetworkHelper.sendToPlayer(kjs$self(), new SetActivePostShaderPayload(Optional.ofNullable(id)));
260260
}
261261
}

‎src/main/java/dev/latvian/mods/kubejs/core/mixin/RecipeManagerMixin.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private void customRecipesHead(Map<ResourceLocation, JsonElement> map, ResourceM
7878

7979
@Inject(
8080
method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V",
81-
at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V")
81+
at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", shift = At.Shift.BEFORE)
8282
)
8383
private void catchFailingRecipes(CallbackInfo ci, @Local Map.Entry<ResourceLocation, JsonElement> entry, @Local RuntimeException ex) {
8484
if (kjs$event != null) {
@@ -90,7 +90,6 @@ private void catchFailingRecipes(CallbackInfo ci, @Local Map.Entry<ResourceLocat
9090
method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V",
9191
at = @At(value = "TAIL")
9292
)
93-
@SuppressWarnings("removal")
9493
private void addServerData(CallbackInfo ci) {
9594
if (kjs$event != null) {
9695
kjs$event.finishEvent();

‎src/main/java/dev/latvian/mods/kubejs/core/mixin/ReloadableServerResourcesMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import dev.latvian.mods.kubejs.core.ReloadableServerResourcesKJS;
44
import dev.latvian.mods.kubejs.server.ServerScriptManager;
55
import dev.latvian.mods.kubejs.util.RegistryAccessContainer;
6-
import me.textrue.kubejs.fabric.thirdparty.mixin.MinecraftServerAccessor;
6+
import me.textrue.kubejs.fabric.thirdparty.mixin.accessors.MinecraftServerAccessor;
77
import net.minecraft.commands.Commands;
88
import net.minecraft.core.LayeredRegistryAccess;
99
import net.minecraft.core.RegistryAccess;

‎src/main/java/dev/latvian/mods/kubejs/core/mixin/WorldLoaderMixin.java‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.latvian.mods.kubejs.core.mixin;
22

3+
import com.llamalad7.mixinextras.sugar.Local;
34
import com.mojang.datafixers.util.Pair;
45
import dev.latvian.mods.kubejs.util.RegistryAccessContainer;
56
import net.minecraft.core.LayeredRegistryAccess;
@@ -19,37 +20,28 @@
1920

2021
@Mixin(WorldLoader.class)
2122
public class WorldLoaderMixin {
22-
@Inject(method = "load", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/RegistryDataLoader;load(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/RegistryAccess;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen;", shift = At.Shift.BEFORE), locals = LocalCapture.CAPTURE_FAILHARD)
23+
@Inject(method = "load", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/RegistryDataLoader;load(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/RegistryAccess;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen;", shift = At.Shift.BEFORE))
2324
private static <D, R> void kjs$load(
2425
WorldLoader.InitConfig initConfig,
2526
WorldLoader.WorldDataSupplier<D> worldDataSupplier,
2627
WorldLoader.ResultFactory<D, R> resultFactory,
2728
Executor backgroundExecutor,
2829
Executor gameExecutor,
2930
CallbackInfoReturnable<CompletableFuture<R>> cir,
30-
Pair<WorldDataConfiguration, CloseableResourceManager> config,
31-
CloseableResourceManager resourceManager,
32-
LayeredRegistryAccess<RegistryLayer> builtinRegistries,
33-
LayeredRegistryAccess<RegistryLayer> worldgenRegistries,
34-
RegistryAccess.Frozen registriesWithDimensions
31+
@Local RegistryAccess.Frozen registriesWithDimensions
3532
) {
3633
RegistryAccessContainer.current = new RegistryAccessContainer(registriesWithDimensions);
3734
}
3835

39-
@Inject(method = "load", at = @At(value = "INVOKE", target = "Lcom/mojang/datafixers/util/Pair;getFirst()Ljava/lang/Object;", shift = At.Shift.BEFORE), locals = LocalCapture.CAPTURE_FAILHARD)
36+
@Inject(method = "load", at = @At(value = "INVOKE", target = "Lcom/mojang/datafixers/util/Pair;getFirst()Ljava/lang/Object;", shift = At.Shift.BEFORE))
4037
private static <D, R> void kjs$load2(
4138
WorldLoader.InitConfig initConfig,
4239
WorldLoader.WorldDataSupplier<D> worldDataSupplier,
4340
WorldLoader.ResultFactory<D, R> resultFactory,
4441
Executor backgroundExecutor,
4542
Executor gameExecutor,
4643
CallbackInfoReturnable<CompletableFuture<R>> cir,
47-
Pair<WorldDataConfiguration, CloseableResourceManager> config,
48-
CloseableResourceManager resourceManager,
49-
LayeredRegistryAccess<RegistryLayer> builtinRegistries,
50-
LayeredRegistryAccess<RegistryLayer> worldgenRegistries,
51-
RegistryAccess.Frozen registriesWithDimensions,
52-
RegistryAccess.Frozen registriesWithEverything
44+
@Local(ordinal = 1) RegistryAccess.Frozen registriesWithEverything
5345
) {
5446
RegistryAccessContainer.current = new RegistryAccessContainer(registriesWithEverything);
5547
}

‎src/main/java/dev/latvian/mods/kubejs/player/KubeJSPlayerEventHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import me.textrue.kubejs.fabric.thirdparty.events.entity.player.PlayerLoggedEvents;
1313
import me.textrue.kubejs.fabric.thirdparty.events.entity.player.PlayerRespawnEvent;
1414
import me.textrue.kubejs.fabric.thirdparty.events.ServerChatEvents;
15-
import me.textrue.kubejs.fabric.thirdparty.mixin.MinecraftServerAccessor;
15+
import me.textrue.kubejs.fabric.thirdparty.mixin.accessors.MinecraftServerAccessor;
1616
import me.textrue.kubejs.fabric.thirdparty.util.event.ThirdPartyEventResult;
1717
import net.minecraft.advancements.AdvancementHolder;
1818
import net.minecraft.resources.ResourceKey;

0 commit comments

Comments
 (0)