markil3/MinecraftImmersiveHUD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates for 1.15.2.

Browse Source
This commit is contained in:
Markil3
2021-03-02 18:16:43 -07:00
parent c0da30efae
commit db9225a6ca
5 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
# Forge Properties
minecraft_version=1.15
mappings=20190719-1.14.3
forge_version=29.0.4
minecraft_version=1.15.2
mappings=20200514-1.15.1
forge_version=31.2.0
# Mod Properties

3
src/main/java/markil3/immersive_hud/EventBus.java
View File

@@ -24,7 +24,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderHandEvent;
import net.minecraftforge.client.event.RenderSpecificHandEvent;
import net.minecraftforge.event.entity.EntityMountEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -97,7 +96,7 @@ public class EventBus
* @param event - event data
*/
@SubscribeEvent
public static void onRenderHand(final RenderSpecificHandEvent event)
public static void onRenderHand(final RenderHandEvent event)
{
if (TimerUtils.onRenderHand(event.getHand(),
event.getMatrixStack(),

32
src/main/java/markil3/immersive_hud/RenderUtils.java
View File

@@ -67,8 +67,8 @@ public class RenderUtils
IngameGui gui,
float ticks)
{
int scaledWidth = mc.func_228018_at_().getScaledWidth();
int scaledHeight = mc.func_228018_at_().getScaledHeight();
int scaledWidth = mc.getMainWindow().getScaledWidth();
int scaledHeight = mc.getMainWindow().getScaledHeight();
Collection<EffectInstance> collection =
mc.player.getActivePotionEffects();
@@ -137,8 +137,8 @@ public class RenderUtils
float f1 = effectAlpha;
list.add(() -> {
mc.getTextureManager()
.bindTexture(textureatlassprite.func_229241_m_()
.func_229223_g_());
.bindTexture(textureatlassprite.getAtlasTexture()
.getTextureLocation());
RenderSystem.color4f(1.0F, 1.0F, 1.0F, f1);
gui.blit(j1 + 3,
k1 + 3,
@@ -185,8 +185,8 @@ public class RenderUtils
jump.getMaxTime(),
jump.getFadeInTime(),
jump.getFadeOutTime());
int scaledWidth = mc.func_228018_at_().getScaledWidth();
int scaledHeight = mc.func_228018_at_().getScaledHeight();
int scaledWidth = mc.getMainWindow().getScaledWidth();
int scaledHeight = mc.getMainWindow().getScaledHeight();
int xPosition = scaledWidth / 2 - 91;
mc.getProfiler().startSection("jumpBar");
@@ -240,8 +240,8 @@ public class RenderUtils
if (mc.playerController.gameIsSurvivalOrAdventure())
{
int scaledWidth = mc.func_228018_at_().getScaledWidth();
int scaledHeight = mc.func_228018_at_().getScaledHeight();
int scaledWidth = mc.getMainWindow().getScaledWidth();
int scaledHeight = mc.getMainWindow().getScaledHeight();
int x = scaledWidth / 2 - 91;
mc.getProfiler().startSection("expBar");
@@ -339,8 +339,8 @@ public class RenderUtils
hotbar.getFadeInTime(),
hotbar.getFadeOutTime());
int scaledWidth = mc.func_228018_at_().getScaledWidth();
int scaledHeight = mc.func_228018_at_().getScaledHeight();
int scaledWidth = mc.getMainWindow().getScaledWidth();
int scaledHeight = mc.getMainWindow().getScaledHeight();
if (playerentity != null)
{
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
@@ -502,7 +502,7 @@ public class RenderUtils
IBakedModel bakedmodel = mc.getItemRenderer().getItemModelWithOverrides(itemIn, (World)null, entityIn);
RenderSystem.pushMatrix();
mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
mc.getTextureManager().func_229267_b_(AtlasTexture.LOCATION_BLOCKS_TEXTURE).setBlurMipmapDirect(false, false);
mc.getTextureManager().getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).setBlurMipmapDirect(false, false);
RenderSystem.enableRescaleNormal();
RenderSystem.enableAlphaTest();
RenderSystem.defaultAlphaFunc();
@@ -514,18 +514,18 @@ public class RenderUtils
RenderSystem.scalef(1.0F, -1.0F, 1.0F);
RenderSystem.scalef(16.0F, 16.0F, 16.0F);
MatrixStack matrixstack = new MatrixStack();
IRenderTypeBuffer.Impl irendertypebuffer$impl = Minecraft.getInstance().func_228019_au_().func_228487_b_();
IRenderTypeBuffer.Impl irendertypebuffer$impl = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource();
Item item = itemIn.getItem();
boolean flag = !bakedmodel.isGui3d() || item == Items.SHIELD || item == Items.TRIDENT;
if (flag) {
RenderHelper.func_227783_c_();
RenderHelper.setupGuiFlatDiffuseLighting();
}
mc.getItemRenderer().func_229111_a_(itemIn, ItemCameraTransforms.TransformType.GUI, false, matrixstack, irendertypebuffer$impl, 15728880, OverlayTexture.field_229196_a_, bakedmodel);
irendertypebuffer$impl.func_228461_a_();
mc.getItemRenderer().renderItem(itemIn, ItemCameraTransforms.TransformType.GUI, false, matrixstack, irendertypebuffer$impl, 15728880, OverlayTexture.NO_OVERLAY, bakedmodel);
irendertypebuffer$impl.finish();
RenderSystem.enableDepthTest();
if (flag) {
RenderHelper.func_227784_d_();
RenderHelper.setupGui3DDiffuseLighting();
}
RenderSystem.disableAlphaTest();

6
src/main/java/markil3/immersive_hud/TimerUtils.java
View File

@@ -305,7 +305,7 @@ public class TimerUtils
/*
* Undo the transformation of the previous hand
*/
matrixStack.func_227862_a_(0,
matrixStack.translate(0,
(float) (1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME),
0);
}
@@ -322,7 +322,7 @@ public class TimerUtils
if (offHandTime < HAND_UP_TIME)
{
matrixStack
.func_227862_a_(0,
.translate(0,
(float) (-1.0F * (HAND_UP_TIME - offHandTime) / HAND_UP_TIME),
0);
}
@@ -342,7 +342,7 @@ public class TimerUtils
if (mainHandTime < HAND_UP_TIME)
{
matrixStack
.func_227861_a_(0,
.translate(0,
(float) (-1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME),
0);
}

6
src/main/resources/META-INF/mods.toml
View File

@@ -6,7 +6,7 @@
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
modLoader="javafml" #mandatory
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
loaderVersion="[28,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
loaderVersion="[31,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
license="GPL-3.0-only"
@@ -57,7 +57,7 @@ The following elements will only show up under certain conditions:
# Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory
# The version range of the dependency
versionRange="[28,)" #mandatory
versionRange="[31,)" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER
@@ -78,6 +78,6 @@ The following elements will only show up under certain conditions:
[[dependencies.immersive_hud]]
modId="minecraft"
mandatory=true
versionRange="[1.15,1.15.2)"
versionRange="[1.15.2,1.16)"
ordering="NONE"
side="CLIENT"