update guilib

MrTroble · Sep 21, 2023 · 9f25897 · 9f25897
1 parent e4a4c4d
commit 9f25897
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/guilib b/guilib
diff --git a/src/main/java/com/troblecodings/signals/blocks/Signal.java b/src/main/java/com/troblecodings/signals/blocks/Signal.java
@@ -181,7 +181,6 @@ public void destroy(final IWorld worldIn, final BlockPos pos, final BlockState s
         }
     }
 
-    @SuppressWarnings("unchecked")
     public int getHeight(final Map<SEProperty, String> map) {
         for (final PredicateProperty<Integer> property : this.prop.signalHeights) {
             if (property.test(map))
@@ -227,7 +226,6 @@ public void renderOverlay(final RenderOverlayInfo info) {
         this.renderOverlay(info, this.prop.customNameRenderHeight);
     }
 
-    @SuppressWarnings("unchecked")
     @OnlyIn(Dist.CLIENT)
     public void renderScaleOverlay(final RenderOverlayInfo info, final float renderHeight) {
         final Map<SEProperty, String> map = ClientSignalStateHandler
@@ -288,7 +286,6 @@ public void renderSingleScaleOverlay(final RenderOverlayInfo info) {
         info.stack.popPose();
     }
 
-    @SuppressWarnings("unchecked")
     @OnlyIn(Dist.CLIENT)
     public void renderOverlay(final RenderOverlayInfo info, final float renderHeight) {
         float customRenderHeight = renderHeight;
@@ -439,7 +436,6 @@ public int getDirectSignal(final BlockState blockState, final IBlockReader block
         return 0;
     }
 
-    @SuppressWarnings("unchecked")
     public void getUpdate(final World world, final BlockPos pos) {
         if (this.prop.sounds.isEmpty())
             return;
@@ -463,14 +459,13 @@ public void getUpdate(final World world, final BlockPos pos) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     public SoundProperty getSound(final Map<SEProperty, String> map) {
         for (final SoundProperty property : this.prop.sounds) {
             if (property.predicate.test(map)) {
                 return property;
             }
         }
-        return new SoundProperty();
+        return new SoundProperty(null, t -> true, -1);
     }
 
     @Override

diff --git a/src/main/java/com/troblecodings/signals/guis/ContainerSignalBox.java b/src/main/java/com/troblecodings/signals/guis/ContainerSignalBox.java
@@ -13,7 +13,6 @@
 import com.troblecodings.guilib.ecs.GuiInfo;
 import com.troblecodings.guilib.ecs.interfaces.UIClientSync;
 import com.troblecodings.signals.OpenSignalsMain;
-import com.troblecodings.signals.blocks.Signal;
 import com.troblecodings.signals.core.PosIdentifier;
 import com.troblecodings.signals.core.ReadBuffer;
 import com.troblecodings.signals.core.SubsidiaryEntry;

diff --git a/src/main/java/com/troblecodings/signals/guis/PreviewSideBar.java b/src/main/java/com/troblecodings/signals/guis/PreviewSideBar.java
@@ -13,6 +13,8 @@
 import com.troblecodings.signals.enums.ChangeableStage;
 import com.troblecodings.signals.models.ModelInfoWrapper;
 
+import net.minecraft.util.math.vector.Quaternion;
+
 public class PreviewSideBar {
 
     public static final float MODIFIER = 0.1f;
@@ -26,8 +28,9 @@ public PreviewSideBar(final float height) {
         blockRenderEntity.setInheritHeight(true);
         blockRenderEntity.setWidth(60);
 
+        // TODO Check if right
         blockRenderEntity.add(new UIDrag((x, y) -> blockRender
-                .updateRotation(QuaternionWrapper.fromXYZ(0, (float) x * MODIFIER, 0))));
+                .updateRotation(new Quaternion(0, (float) x * MODIFIER, 0, false))));
 
         blockRenderEntity.add(new UIScissor());
         blockRenderEntity.add(new UIColor(GuiSignalBox.BACKGROUND_COLOR));
@@ -69,7 +72,7 @@ public void clear() {
     }
 
     public void update(final Signal signal) {
-        blockRender.setBlockState(new ModelInfoWrapper(signal, properties));
+        blockRender.setBlockState(signal.defaultBlockState(), new ModelInfoWrapper(properties));
     }
 
 }
diff --git a/src/main/java/com/troblecodings/signals/guis/SidePanel.java b/src/main/java/com/troblecodings/signals/guis/SidePanel.java
@@ -245,8 +245,8 @@ public void helpUsageMode(final Map<BlockPos, SubsidiaryHolder> subsidiaries,
 
                             allNodes.forEach(currentNode -> {
                                 final UILabel currentStatus = new UILabel(
-                                        I18n.format("info.usage.status") + " : "
-                                                + I18n.format("info.usage.status.free"));
+                                        I18n.get("info.usage.status") + " : "
+                                                + I18n.get("info.usage.status.free"));
                                 currentStatus.setTextColor(new UIEntity().getBasicTextColor());
                                 final UIEntity statusEntity = new UIEntity();
                                 statusEntity.setInheritWidth(true);
@@ -259,15 +259,15 @@ public void helpUsageMode(final Map<BlockPos, SubsidiaryHolder> subsidiaries,
                                             .getEntry(PathEntryType.PATHUSAGE);
                                     if (pathUsage.isPresent()
                                             && !pathUsage.get().equals(EnumPathUsage.FREE)) {
-                                        currentStatus.setText(I18n.format("info.usage.status")
-                                                + " : " + I18n.format("info.usage.status.blocked"));
+                                        currentStatus.setText(I18n.get("info.usage.status") + " : "
+                                                + I18n.get("info.usage.status.blocked"));
                                         canBeManuelChanged.set(false);
                                     }
                                     if (!entry.containsEntry(PathEntryType.OUTPUT))
                                         return;
                                     final String name = currentNode.getPoint().toString() + " - "
                                             + ClientNameHandler.getClientName(new NameStateInfo(
-                                                    mc.world,
+                                                    mc.level,
                                                     entry.getEntry(PathEntryType.OUTPUT).get()));
                                     final UIEntity button = GuiElements.createButton(name, e1 -> {
                                         gui.pop();

diff --git a/src/main/java/com/troblecodings/signals/models/ModelInfoWrapper.java b/src/main/java/com/troblecodings/signals/models/ModelInfoWrapper.java
@@ -1,18 +1,29 @@
 package com.troblecodings.signals.models;
 
+import java.util.Map;
+
+import com.troblecodings.core.interfaces.BlockModelDataWrapper;
 import com.troblecodings.signals.SEProperty;
 
 import net.minecraftforge.client.model.data.IModelData;
+import net.minecraftforge.client.model.data.ModelDataMap;
+import net.minecraftforge.client.model.data.ModelDataMap.Builder;
 import net.minecraftforge.client.model.data.ModelProperty;
 
-public class ModelInfoWrapper implements IModelData {
+public class ModelInfoWrapper implements BlockModelDataWrapper {
 
     private final IModelData data;
 
     public ModelInfoWrapper(final IModelData data) {
         this.data = data;
     }
 
+    public ModelInfoWrapper(final Map<SEProperty, String> states) {
+        final Builder builder = new ModelDataMap.Builder();
+        states.forEach((property, value) -> builder.withInitial(property, value));
+        this.data = builder.build();
+    }
+
     @Override
     public boolean hasProperty(final ModelProperty<?> prop) {
         return data.hasProperty(prop);
+9 −1		src/com/troblecodings/core/NBTWrapper.java
+7 −0		src/com/troblecodings/core/interfaces/BlockModelDataWrapper.java
+6 −2		src/com/troblecodings/guilib/ecs/ContainerBase.java
+0 −49		src/com/troblecodings/guilib/ecs/DrawUtil.java
+13 −3		src/com/troblecodings/guilib/ecs/GuiElements.java
+11 −7		src/com/troblecodings/guilib/ecs/entitys/BufferWrapper.java
+18 −0		src/com/troblecodings/guilib/ecs/entitys/DrawInfo.java
+33 −38		src/com/troblecodings/guilib/ecs/entitys/UIBlockRender.java
+1 −1		src/com/troblecodings/guilib/ecs/entitys/UIBox.java
+15 −0		src/com/troblecodings/guilib/ecs/entitys/UIComponent.java
+25 −5		src/com/troblecodings/guilib/ecs/entitys/render/UIToolTip.java