Merge remote-tracking branch 'origin/master'

# Conflicts:
#	version.properties

build.gradle

@@ -187,6 +187,8 @@ dependencies {
     runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}")
     implementation fg.deobf('me.desht.pneumaticcraft:pneumaticcraft-repressurized:1.16.5-2.12.2-186')
 
+    implementation fg.deobf("curse.maven:hwyla-253449:3033593")
+
     implementation fg.deobf("curse.maven:create-328085:3384222")
     implementation fg.deobf("curse.maven:flywheel-486392:3384004")
 

src/main/java/com/ticticboooom/mods/mm/block/ControllerBlock.java

@@ -31,7 +31,6 @@ import javax.annotation.Nullable;
 import java.util.stream.Stream;
 
 public class ControllerBlock extends DirectionalBlock {
-
     private RegistryObject<TileEntityType<?>> type;
     @Getter
     private String controllerName;

src/main/java/com/ticticboooom/mods/mm/client/ter/StructureGenTileEntityRenderer.java

@@ -52,12 +52,21 @@ public class StructureGenTileEntityRenderer extends TileEntityRenderer<Structure
             matrixStackIn.push();
             Matrix4f mat = matrixStackIn.getLast().getMatrix();
 
-            int x = Math.min(pos1.getX(), pos2.getX());
-            int y = Math.min(pos1.getY(), pos2.getY());
-            int z = Math.min(pos1.getZ(), pos2.getZ());
-            int dx = Math.max(pos1.getX(), pos2.getX()) + 1;
-            int dy = Math.max(pos1.getY(), pos2.getY()) + 1;
-            int dz = Math.max(pos1.getZ(), pos2.getZ()) + 1;
+            float x = Math.min(pos1.getX(), pos2.getX());
+            float y = Math.min(pos1.getY(), pos2.getY());
+            float z = Math.min(pos1.getZ(), pos2.getZ());
+            float dx = Math.max(pos1.getX(), pos2.getX()) + 1;
+            float dy = Math.max(pos1.getY(), pos2.getY()) + 1;
+            float dz = Math.max(pos1.getZ(), pos2.getZ()) + 1;
+            float xAdjust = addWiggleRoom(x,dx);
+            x = x+xAdjust;
+            dx = dx+(xAdjust*-1);
+            float yAdjust = addWiggleRoom(y,dy);
+            y = y+yAdjust;
+            dy = dy+(yAdjust*-1);
+            float zAdjust = addWiggleRoom(z,dz);
+            z = z+zAdjust;
+            dz = dz+(zAdjust*-1);
 
             int R = 255, G = 255, B = 255, A = 70;
             builder.pos(mat, x , y, z).color(R, G, B, A).endVertex();
@@ -93,4 +102,11 @@ public class StructureGenTileEntityRenderer extends TileEntityRenderer<Structure
             matrixStackIn.pop();
         }
     }
+
+    private float addWiggleRoom(float coordOne, float coordTwo) {
+        if(coordOne > coordTwo) {
+            return 0.05f;
+        }
+        return -0.05f;
+    }
 }

src/main/java/com/ticticboooom/mods/mm/ports/storage/EnergyPortStorage.java

@@ -4,15 +4,11 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.ticticboooom.mods.mm.MM;
-import com.ticticboooom.mods.mm.block.container.PortBlockContainer;
-import com.ticticboooom.mods.mm.block.tile.MachinePortBlockEntity;
 import com.ticticboooom.mods.mm.inventory.PortEnergyInventory;
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.AbstractGui;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.Slot;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.capabilities.Capability;
@@ -67,8 +63,9 @@ public class EnergyPortStorage extends PortStorage {
         if (inv.getMaxEnergyStored() > 0) {
             amount = (float)inv.getEnergyStored() / inv.getMaxEnergyStored();
         }
-        screen.blit(stack, left + barOffsetX, top + barOffsetY, 193, 18, 18, (int) (108 * amount));
-        AbstractGui.drawString(stack, Minecraft.getInstance().fontRenderer,Math.round((float)10000 * amount) / 100.f + "%", left + 30, top + 60, 0xfefefe);
+        //screen.blit(stack, left + barOffsetX, top + barOffsetY, 193, 18, 18, (int) (108 * amount));
+        screen.blit(stack, left + barOffsetX, top + barOffsetY + 108 - (int) (108*amount), 193, 18, 18, (int) (108*amount)-1);
+        AbstractGui.drawString(stack, Minecraft.getInstance().fontRenderer,String.format("%.2f",Math.round((float)10000 * amount) / 100.f) + "%", left + 30, top + 60, 0xfefefe);
         AbstractGui.drawString(stack, Minecraft.getInstance().fontRenderer, inv.getEnergyStored() + "FE", left + 30, top + 80, 0xfefefe);
     }
 }

src/main/java/com/ticticboooom/mods/mm/ports/storage/ManaPortStorage.java

@@ -73,7 +73,7 @@ public class ManaPortStorage extends PortStorage {
         if (inv.getMaxManaStored() > 0) {
             amount = (float)inv.getManaStored() / inv.getMaxManaStored();
         }
-        screen.blit(stack, left + barOffsetX, top + barOffsetY, 193, 18, 18, (int) (108 * amount));
+        screen.blit(stack, left + barOffsetX, top + barOffsetY + 108 - (int) (108*amount), 193, 18, 18, (int) (108*amount)-1);
         AbstractGui.drawString(stack, Minecraft.getInstance().fontRenderer, inv.getManaStored() + " Mana", left + 30, top + 60, 0xfefefe);
     }
 }

version.properties

@@ -1,2 +1,2 @@
-#Sat Aug 21 12:08:19 BST 2021
-VERSION_CODE=747
+#Thu Aug 19 18:35:01 EDT 2021
+VERSION_CODE=729