diff --git a/build.gradle b/build.gradle index 2d5866b..73de53e 100644 --- a/build.gradle +++ b/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") diff --git a/src/main/java/com/ticticboooom/mods/mm/block/ControllerBlock.java b/src/main/java/com/ticticboooom/mods/mm/block/ControllerBlock.java index ac163a8..18b4d2e 100644 --- a/src/main/java/com/ticticboooom/mods/mm/block/ControllerBlock.java +++ b/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> type; @Getter private String controllerName; diff --git a/src/main/java/com/ticticboooom/mods/mm/client/ter/StructureGenTileEntityRenderer.java b/src/main/java/com/ticticboooom/mods/mm/client/ter/StructureGenTileEntityRenderer.java index deb3d25..6965558 100644 --- a/src/main/java/com/ticticboooom/mods/mm/client/ter/StructureGenTileEntityRenderer.java +++ b/src/main/java/com/ticticboooom/mods/mm/client/ter/StructureGenTileEntityRenderer.java @@ -52,12 +52,21 @@ public class StructureGenTileEntityRenderer extends TileEntityRenderer coordTwo) { + return 0.05f; + } + return -0.05f; + } } diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/storage/EnergyPortStorage.java b/src/main/java/com/ticticboooom/mods/mm/ports/storage/EnergyPortStorage.java index 38f72eb..c528705 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/storage/EnergyPortStorage.java +++ b/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); } } diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/storage/ManaPortStorage.java b/src/main/java/com/ticticboooom/mods/mm/ports/storage/ManaPortStorage.java index aa99201..9b1bfab 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/storage/ManaPortStorage.java +++ b/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); } } diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_input_cutout.png index 29cbe09..65bed70 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_output_cutout.png index eda2b50..29041ca 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/energy_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_input_cutout.png index de7b4a0..ca142a9 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_output_cutout.png index 5eb9e7e..2d71051 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/fluid_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_input_cutout.png index a0c214c..4b56f53 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_output_cutout.png index e5bf080..70e3bf7 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/base_ports/item_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_input_cutout.png index 1f0c953..d44fc22 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_output_cutout.png index c1fedd3..172c551 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/astral_starlight_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_input_cutout.png index 5bad54b..98de566 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_output_cutout.png index 07d4b97..3fcd87e 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/botania_mana_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_input_cutout.png index c4f1d52..484328b 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_output_cutout.png index 7201d31..a17d325 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/create_rotation_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_input_cutout.png index ce570c3..c51a36f 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_output_cutout.png index 575b517..acdd205 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_gas_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_input_cutout.png index d9663a1..411de43 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_output_cutout.png index d14635d..c650fb2 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_heat_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_input_cutout.png index db859dc..8940d4b 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_output_cutout.png index 175324d..b3410ae 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_infusion_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_input_cutout.png index 80988a9..7457b86 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_output_cutout.png index 62ffb64..913bf9c 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_laser_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_input_cutout.png index a85a889..baf558e 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_output_cutout.png index 6cd1094..ce95aa4 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_pigment_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_input_cutout.png index ec3f2f7..dc6aaf1 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_output_cutout.png index 62ffb64..a3c3cb3 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/mekanism_slurry_output_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_input_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_input_cutout.png index a2abb1a..9a77620 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_input_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_input_cutout.png differ diff --git a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_output_cutout.png b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_output_cutout.png index bf55645..de783d5 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_output_cutout.png and b/src/main/resources/assets/masterfulmachinery/textures/block/compat_ports/pncr_pressure_output_cutout.png differ diff --git a/version.properties b/version.properties index fd2a135..18c2d3b 100644 --- a/version.properties +++ b/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