Skip to content

Commit 413b699

Browse files
zyxkadzyxkad
committed
only have refined storage and create filters left to port
1 parent ff062d9 commit 413b699

117 files changed

Lines changed: 891 additions & 1991 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/de/srendi/advancedperipherals/client/ClientEventSubscriber.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.mojang.blaze3d.platform.InputConstants;
44
import com.mojang.blaze3d.platform.Window;
5-
import dan200.computercraft.shared.ModRegistry;
65
import de.srendi.advancedperipherals.client.smartglasses.OverlayObjectHolder;
76
import de.srendi.advancedperipherals.common.entity.TurtleSeatEntity;
87
import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
@@ -16,7 +15,6 @@
1615
import net.minecraft.client.Minecraft;
1716
import net.minecraft.client.player.Input;
1817
import net.minecraft.client.player.LocalPlayer;
19-
import net.minecraft.world.entity.ai.attributes.Attributes;
2018
import net.minecraft.world.item.ItemStack;
2119
import net.minecraft.world.level.block.state.BlockState;
2220
import net.minecraft.world.phys.BlockHitResult;
@@ -69,7 +67,7 @@ public static void preClientTick(ClientTickEvent event) {
6967
if (smartGlasses.isEmpty()) {
7068
return;
7169
}
72-
int glassesId = SmartGlassesItem.getComputerID(smartGlasses);
70+
int glassesId = ((SmartGlassesItem) smartGlasses.getItem()).getComputerID(smartGlasses);
7371
Window window = minecraft.getWindow();
7472

7573
int sizeX = window.getWidth(), sizeY = window.getHeight();
@@ -162,11 +160,11 @@ public static void playerInteraction(InputEvent.InteractionKeyMappingTriggered e
162160
}
163161

164162
ItemStack glasses = SmartGlassesItem.getEquipped(player);
165-
if (glasses.isEmpty() || !glasses.getOrDefault(ModRegistry.DataComponents.ON.get(), false)) {
163+
if (glasses.isEmpty() || !SmartGlassesItem.isMarkedOn(glasses)) {
166164
return;
167165
}
168166

169-
int buttons = SmartGlassesItem.getModuleData(glasses, KeyboardModule.ID, APDataComponents.HANDLING_INTERACTION_BUTTONS.get(), (byte) 0);
167+
int buttons = SmartGlassesItem.getModuleDatas(glasses, KeyboardModule.ID).getByte(APDataComponents.HANDLING_INTERACTION_BUTTONS);
170168

171169
if (((1 << button) & buttons) == 0) {
172170
return;

‎src/main/java/de/srendi/advancedperipherals/client/ClientRegistry.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
import de.srendi.advancedperipherals.common.setup.APBlockEntityTypes;
1515
import de.srendi.advancedperipherals.common.setup.APContainerTypes;
1616
import de.srendi.advancedperipherals.common.setup.CCRegistration;
17-
import net.neoforged.api.distmarker.Dist;
18-
import net.neoforged.bus.api.EventPriority;
19-
import net.neoforged.bus.api.SubscribeEvent;
20-
import net.neoforged.fml.common.EventBusSubscriber;
21-
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
22-
import net.neoforged.neoforge.client.event.EntityRenderersEvent;
23-
import net.neoforged.neoforge.client.event.RegisterGuiLayersEvent;
24-
import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
25-
import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
17+
import net.minecraft.client.gui.screens.MenuScreens;
18+
import net.minecraftforge.api.distmarker.Dist;
19+
import net.minecraftforge.client.event.EntityRenderersEvent;
20+
import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
21+
import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
22+
import net.minecraftforge.eventbus.api.EventPriority;
23+
import net.minecraftforge.eventbus.api.SubscribeEvent;
24+
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
25+
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
2626

2727
@EventBusSubscriber(Dist.CLIENT)
2828
public class ClientRegistry {
@@ -32,17 +32,18 @@ public class ClientRegistry {
3232

3333
@SubscribeEvent
3434
public static void onClientSetup(FMLClientSetupEvent event) {
35+
menuRegister();
36+
3537
ItemPropertiesRegistry.register();
3638
if (APAddon.AE2.isLoaded()) {
3739
AERendererRegister.register();
3840
}
3941
}
4042

41-
@SubscribeEvent
42-
public static void menuRegister(RegisterMenuScreensEvent event) {
43-
event.register(APContainerTypes.INVENTORY_MANAGER_CONTAINER.get(), InventoryManagerScreen::new);
44-
event.register(APContainerTypes.KEYBOARD_CONTAINER.get(), KeyboardScreen::new);
45-
event.register(APContainerTypes.SMART_GLASSES_CONTAINER.get(), SmartGlassesScreen::new);
43+
public static void menuRegister() {
44+
MenuScreens.register(APContainerTypes.INVENTORY_MANAGER_CONTAINER.get(), InventoryManagerScreen::new);
45+
MenuScreens.register(APContainerTypes.KEYBOARD_CONTAINER.get(), KeyboardScreen::new);
46+
MenuScreens.register(APContainerTypes.SMART_GLASSES_CONTAINER.get(), SmartGlassesScreen::new);
4647
}
4748

4849
@SubscribeEvent
@@ -74,8 +75,8 @@ public static void registeringRenderers(EntityRenderersEvent.RegisterRenderers e
7475
}
7576

7677
@SubscribeEvent(priority = EventPriority.LOWEST)
77-
public static void registeringOverlays(RegisterGuiLayersEvent event) {
78-
event.registerAboveAll(SaddleTurtleOverlay.ID, SADDLE_TURTLE_OVERLAY);
79-
event.registerAboveAll(OverlayModuleOverlay.ID, OVERLAY_MODULE_OVERLAY);
78+
public static void registeringOverlays(RegisterGuiOverlaysEvent event) {
79+
event.registerAboveAll(SaddleTurtleOverlay.ID.toString(), SADDLE_TURTLE_OVERLAY);
80+
event.registerAboveAll(OverlayModuleOverlay.ID.toString(), OVERLAY_MODULE_OVERLAY);
8081
}
8182
}

‎src/main/java/de/srendi/advancedperipherals/client/ClientWorker.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package de.srendi.advancedperipherals.client;
22

33
import net.minecraft.client.Minecraft;
4-
import net.neoforged.api.distmarker.Dist;
5-
import net.neoforged.bus.api.SubscribeEvent;
6-
import net.neoforged.fml.common.EventBusSubscriber;
7-
import net.neoforged.neoforge.client.event.ClientTickEvent;
8-
import net.neoforged.neoforge.event.level.LevelEvent;
4+
import net.minecraftforge.api.distmarker.Dist;
5+
import net.minecraftforge.event.TickEvent.ClientTickEvent;
6+
import net.minecraftforge.event.level.LevelEvent;
7+
import net.minecraftforge.eventbus.api.SubscribeEvent;
8+
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
99

1010
import java.util.Map;
1111
import java.util.concurrent.ConcurrentHashMap;
@@ -24,7 +24,10 @@ public static void put(final String id, final Runnable task) {
2424
}
2525

2626
@SubscribeEvent
27-
public static void clientTick(ClientTickEvent.Post event) {
27+
public static void clientTick(ClientTickEvent event) {
28+
if (event.phase != ClientTickEvent.Phase.END) {
29+
return;
30+
}
2831
tasks.forEach((id, runnable) -> {
2932
tasks.remove(id, runnable);
3033
runnable.run();

‎src/main/java/de/srendi/advancedperipherals/client/ItemPropertiesRegistry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ItemPropertiesRegistry {
99

1010
public static void register() {
1111
ItemProperties.register(APItems.MEMORY_CARD.get(), AdvancedPeripherals.getRL("bounded"), (stack, level, entity, seed) -> {
12-
return stack.get(APDataComponents.OWNER) == null ? 0 : 1;
12+
return stack.hasTag() && stack.getTag().contains(APDataComponents.OWNER) ? 1 : 0;
1313
});
1414
}
1515

‎src/main/java/de/srendi/advancedperipherals/client/KeyBindings.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.mojang.blaze3d.platform.InputConstants;
44
import de.srendi.advancedperipherals.AdvancedPeripherals;
55
import net.minecraft.client.KeyMapping;
6-
import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
7-
import net.neoforged.neoforge.client.settings.KeyConflictContext;
6+
import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
7+
import net.minecraftforge.client.settings.KeyConflictContext;
88
import org.lwjgl.glfw.GLFW;
99

1010
public class KeyBindings {
@@ -30,5 +30,4 @@ public static void register(RegisterKeyMappingsEvent event) {
3030
event.register(DESCRIPTION_KEYBINDING);
3131
event.register(GLASSES_HOTKEY_KEYBINDING);
3232
}
33-
3433
}

‎src/main/java/de/srendi/advancedperipherals/client/MetaTurtleUpgradeModeller.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
import dan200.computercraft.api.turtle.TurtleSide;
1010
import de.srendi.advancedperipherals.common.util.DataStorageUtil;
1111
import de.srendi.advancedperipherals.lib.turtle.ClockwiseAnimatedTurtleUpgrade;
12-
import net.minecraft.core.component.DataComponentPatch;
1312
import org.jetbrains.annotations.NotNull;
1413
import org.jetbrains.annotations.Nullable;
1514

1615
public class MetaTurtleUpgradeModeller<T extends ClockwiseAnimatedTurtleUpgrade<?>> implements TurtleUpgradeModeller<T> {
1716

1817
@Override
1918
@NotNull
20-
public TransformedModel getModel(@NotNull T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, DataComponentPatch dataComponentPatch) {
19+
public TransformedModel getModel(@NotNull T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side) {
2120
if (upgrade.getLeftModel() != null) {
2221
return TransformedModel.of(side == TurtleSide.LEFT ? upgrade.getLeftModel() : upgrade.getRightModel());
2322
}

‎src/main/java/de/srendi/advancedperipherals/client/screens/base/BaseItemScreen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protected BaseItemScreen(T screenContainer, Inventory inv, Component titleIn) {
2121

2222
@Override
2323
public void render(@NotNull GuiGraphics guiGraphics, int x, int y, float partialTicks) {
24-
renderBackground(guiGraphics, x, y, partialTicks);
24+
renderBackground(guiGraphics);
2525
super.render(guiGraphics, x, y, partialTicks);
2626
renderTooltip(guiGraphics, x, y);
2727
}

‎src/main/java/de/srendi/advancedperipherals/client/screens/base/BaseScreen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ protected BaseScreen(T screenContainer, Inventory inv, Component titleIn) {
1818

1919
@Override
2020
public void render(@NotNull GuiGraphics guiGraphics, int x, int y, float partialTicks) {
21-
renderBackground(guiGraphics, x, y, partialTicks);
21+
renderBackground(guiGraphics);
2222
super.render(guiGraphics, x, y, partialTicks);
2323
renderTooltip(guiGraphics, x, y);
2424
}

‎src/main/java/de/srendi/advancedperipherals/client/smartglasses/OverlayModuleOverlay.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
import de.srendi.advancedperipherals.client.smartglasses.objects.twodim.ITwoDObjectRenderer;
55
import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
66
import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.OverlayObject;
7-
import net.minecraft.client.DeltaTracker;
7+
import net.minecraft.client.Minecraft;
88
import net.minecraft.client.gui.GuiGraphics;
9-
import net.minecraft.client.gui.LayeredDraw;
109
import net.minecraft.client.player.LocalPlayer;
1110
import net.minecraft.resources.ResourceLocation;
11+
import net.minecraftforge.client.gui.overlay.ForgeGui;
12+
import net.minecraftforge.client.gui.overlay.IGuiOverlay;
1213

1314
import java.util.ArrayList;
1415
import java.util.HashMap;
@@ -17,13 +18,13 @@
1718
import java.util.NavigableMap;
1819
import java.util.TreeMap;
1920

20-
public class OverlayModuleOverlay implements LayeredDraw.Layer {
21+
public class OverlayModuleOverlay implements IGuiOverlay {
2122
public static final ResourceLocation ID = AdvancedPeripherals.getRL("overlay_module_overlay");
2223

2324
@SuppressWarnings("rawtypes")
2425
@Override
25-
public void render(GuiGraphics gui, DeltaTracker deltaTracker) {
26-
LocalPlayer player = gui.minecraft.player;
26+
public void render(ForgeGui fgui, GuiGraphics gui, float partialTick, int screenWidth, int screenHeight) {
27+
LocalPlayer player = Minecraft.getInstance().player;
2728
if (player == null) {
2829
return;
2930
}
@@ -55,7 +56,7 @@ public void render(GuiGraphics gui, DeltaTracker deltaTracker) {
5556
if (entry.getValue().isEmpty()) {
5657
continue;
5758
}
58-
entry.getKey().renderBatch(entry.getValue(), gui, deltaTracker);
59+
entry.getKey().renderBatch(entry.getValue(), gui, partialTick);
5960
}
6061
}
6162
}

‎src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/threedim/BlockRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.minecraft.util.RandomSource;
1818
import net.minecraft.world.level.block.state.BlockState;
1919
import net.minecraft.world.phys.Vec3;
20-
import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
20+
import net.minecraftforge.client.event.RenderLevelStageEvent;
2121
import org.joml.Quaternionf;
2222

2323
import java.util.List;

0 commit comments

Comments
 (0)