Compare commits
5 Commits
v1.1-1.15.
...
v1.1.1-1.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0aa3ff4266 | ||
|
|
7bbb03736d | ||
|
|
c5c62a0675 | ||
|
|
a357b924d8 | ||
|
|
3c2e6baa0c |
@@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx3G
|
|||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
# Forge Properties
|
# Forge Properties
|
||||||
minecraft_version=1.15.2
|
minecraft_version=1.15
|
||||||
mappings=20200514-1.15.1
|
mappings=20190719-1.14.3
|
||||||
forge_version=31.2.0
|
forge_version=29.0.4
|
||||||
|
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.1
|
mod_version = 1.1.1
|
||||||
maven_group = markil3
|
maven_group = markil3
|
||||||
archives_base_name = immersive_hud
|
archives_base_name = immersive_hud
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package markil3.immersive_hud;
|
|||||||
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
||||||
import com.electronwill.nightconfig.core.io.WritingMode;
|
import com.electronwill.nightconfig.core.io.WritingMode;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.util.math.MathHelper;
|
import net.minecraft.util.math.MathHelper;
|
||||||
import net.minecraftforge.common.ForgeConfigSpec;
|
import net.minecraftforge.common.ForgeConfigSpec;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
@@ -50,7 +51,7 @@ public class ConfigManager
|
|||||||
new ForgeConfigSpec.Builder().configure(ConfigManager::new);
|
new ForgeConfigSpec.Builder().configure(ConfigManager::new);
|
||||||
INSTANCE = specPair.getLeft();
|
INSTANCE = specPair.getLeft();
|
||||||
SPEC = specPair.getRight();
|
SPEC = specPair.getRight();
|
||||||
CommentedFileConfig config = CommentedFileConfig.builder(CONFIG_PATH)
|
CommentedFileConfig config = CommentedFileConfig.builder(Minecraft.getInstance().gameDir.toPath().toAbsolutePath().resolve(CONFIG_PATH))
|
||||||
.sync()
|
.sync()
|
||||||
.autoreload()
|
.autoreload()
|
||||||
.writingMode(WritingMode.REPLACE)
|
.writingMode(WritingMode.REPLACE)
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import net.minecraft.item.Item;
|
|||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
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.EntityMountEvent;
|
||||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
@@ -116,7 +116,7 @@ public class EventBus
|
|||||||
* @param event - event data
|
* @param event - event data
|
||||||
*/
|
*/
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void onRenderHand(final RenderHandEvent event)
|
public static void onRenderHand(final RenderSpecificHandEvent event)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -67,8 +67,8 @@ public class RenderUtils
|
|||||||
IngameGui gui,
|
IngameGui gui,
|
||||||
float ticks)
|
float ticks)
|
||||||
{
|
{
|
||||||
int scaledWidth = mc.getMainWindow().getScaledWidth();
|
int scaledWidth = mc.func_228018_at_().getScaledWidth();
|
||||||
int scaledHeight = mc.getMainWindow().getScaledHeight();
|
int scaledHeight = mc.func_228018_at_().getScaledHeight();
|
||||||
|
|
||||||
Collection<EffectInstance> collection =
|
Collection<EffectInstance> collection =
|
||||||
mc.player.getActivePotionEffects();
|
mc.player.getActivePotionEffects();
|
||||||
@@ -137,8 +137,8 @@ public class RenderUtils
|
|||||||
float f1 = effectAlpha;
|
float f1 = effectAlpha;
|
||||||
list.add(() -> {
|
list.add(() -> {
|
||||||
mc.getTextureManager()
|
mc.getTextureManager()
|
||||||
.bindTexture(textureatlassprite.getAtlasTexture()
|
.bindTexture(textureatlassprite.func_229241_m_()
|
||||||
.getTextureLocation());
|
.func_229223_g_());
|
||||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, f1);
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, f1);
|
||||||
gui.blit(j1 + 3,
|
gui.blit(j1 + 3,
|
||||||
k1 + 3,
|
k1 + 3,
|
||||||
@@ -185,8 +185,8 @@ public class RenderUtils
|
|||||||
jump.getMaxTime(),
|
jump.getMaxTime(),
|
||||||
jump.getFadeInTime(),
|
jump.getFadeInTime(),
|
||||||
jump.getFadeOutTime());
|
jump.getFadeOutTime());
|
||||||
int scaledWidth = mc.getMainWindow().getScaledWidth();
|
int scaledWidth = mc.func_228018_at_().getScaledWidth();
|
||||||
int scaledHeight = mc.getMainWindow().getScaledHeight();
|
int scaledHeight = mc.func_228018_at_().getScaledHeight();
|
||||||
int xPosition = scaledWidth / 2 - 91;
|
int xPosition = scaledWidth / 2 - 91;
|
||||||
|
|
||||||
mc.getProfiler().startSection("jumpBar");
|
mc.getProfiler().startSection("jumpBar");
|
||||||
@@ -240,8 +240,8 @@ public class RenderUtils
|
|||||||
|
|
||||||
if (mc.playerController.gameIsSurvivalOrAdventure())
|
if (mc.playerController.gameIsSurvivalOrAdventure())
|
||||||
{
|
{
|
||||||
int scaledWidth = mc.getMainWindow().getScaledWidth();
|
int scaledWidth = mc.func_228018_at_().getScaledWidth();
|
||||||
int scaledHeight = mc.getMainWindow().getScaledHeight();
|
int scaledHeight = mc.func_228018_at_().getScaledHeight();
|
||||||
int x = scaledWidth / 2 - 91;
|
int x = scaledWidth / 2 - 91;
|
||||||
|
|
||||||
mc.getProfiler().startSection("expBar");
|
mc.getProfiler().startSection("expBar");
|
||||||
@@ -339,8 +339,8 @@ public class RenderUtils
|
|||||||
hotbar.getFadeInTime(),
|
hotbar.getFadeInTime(),
|
||||||
hotbar.getFadeOutTime());
|
hotbar.getFadeOutTime());
|
||||||
|
|
||||||
int scaledWidth = mc.getMainWindow().getScaledWidth();
|
int scaledWidth = mc.func_228018_at_().getScaledWidth();
|
||||||
int scaledHeight = mc.getMainWindow().getScaledHeight();
|
int scaledHeight = mc.func_228018_at_().getScaledHeight();
|
||||||
if (playerentity != null)
|
if (playerentity != null)
|
||||||
{
|
{
|
||||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
|
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);
|
IBakedModel bakedmodel = mc.getItemRenderer().getItemModelWithOverrides(itemIn, (World)null, entityIn);
|
||||||
RenderSystem.pushMatrix();
|
RenderSystem.pushMatrix();
|
||||||
mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||||
mc.getTextureManager().getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).setBlurMipmapDirect(false, false);
|
mc.getTextureManager().func_229267_b_(AtlasTexture.LOCATION_BLOCKS_TEXTURE).setBlurMipmapDirect(false, false);
|
||||||
RenderSystem.enableRescaleNormal();
|
RenderSystem.enableRescaleNormal();
|
||||||
RenderSystem.enableAlphaTest();
|
RenderSystem.enableAlphaTest();
|
||||||
RenderSystem.defaultAlphaFunc();
|
RenderSystem.defaultAlphaFunc();
|
||||||
@@ -514,18 +514,18 @@ public class RenderUtils
|
|||||||
RenderSystem.scalef(1.0F, -1.0F, 1.0F);
|
RenderSystem.scalef(1.0F, -1.0F, 1.0F);
|
||||||
RenderSystem.scalef(16.0F, 16.0F, 16.0F);
|
RenderSystem.scalef(16.0F, 16.0F, 16.0F);
|
||||||
MatrixStack matrixstack = new MatrixStack();
|
MatrixStack matrixstack = new MatrixStack();
|
||||||
IRenderTypeBuffer.Impl irendertypebuffer$impl = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource();
|
IRenderTypeBuffer.Impl irendertypebuffer$impl = Minecraft.getInstance().func_228019_au_().func_228487_b_();
|
||||||
Item item = itemIn.getItem();
|
Item item = itemIn.getItem();
|
||||||
boolean flag = !bakedmodel.isGui3d() || item == Items.SHIELD || item == Items.TRIDENT;
|
boolean flag = !bakedmodel.isGui3d() || item == Items.SHIELD || item == Items.TRIDENT;
|
||||||
if (flag) {
|
if (flag) {
|
||||||
RenderHelper.setupGuiFlatDiffuseLighting();
|
RenderHelper.func_227783_c_();
|
||||||
}
|
}
|
||||||
|
|
||||||
mc.getItemRenderer().renderItem(itemIn, ItemCameraTransforms.TransformType.GUI, false, matrixstack, irendertypebuffer$impl, 15728880, OverlayTexture.NO_OVERLAY, bakedmodel);
|
mc.getItemRenderer().func_229111_a_(itemIn, ItemCameraTransforms.TransformType.GUI, false, matrixstack, irendertypebuffer$impl, 15728880, OverlayTexture.field_229196_a_, bakedmodel);
|
||||||
irendertypebuffer$impl.finish();
|
irendertypebuffer$impl.func_228461_a_();
|
||||||
RenderSystem.enableDepthTest();
|
RenderSystem.enableDepthTest();
|
||||||
if (flag) {
|
if (flag) {
|
||||||
RenderHelper.setupGui3DDiffuseLighting();
|
RenderHelper.func_227784_d_();
|
||||||
}
|
}
|
||||||
|
|
||||||
RenderSystem.disableAlphaTest();
|
RenderSystem.disableAlphaTest();
|
||||||
|
|||||||
@@ -308,7 +308,7 @@ public class TimerUtils
|
|||||||
/*
|
/*
|
||||||
* Undo the transformation of the previous hand
|
* Undo the transformation of the previous hand
|
||||||
*/
|
*/
|
||||||
matrixStack.translate(0,
|
matrixStack.func_227862_a_(0,
|
||||||
(float) (1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME),
|
(float) (1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME),
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
@@ -325,7 +325,7 @@ public class TimerUtils
|
|||||||
if (offHandTime < HAND_UP_TIME)
|
if (offHandTime < HAND_UP_TIME)
|
||||||
{
|
{
|
||||||
matrixStack
|
matrixStack
|
||||||
.translate(0,
|
.func_227862_a_(0,
|
||||||
(float) (-1.0F * (HAND_UP_TIME - offHandTime) / HAND_UP_TIME),
|
(float) (-1.0F * (HAND_UP_TIME - offHandTime) / HAND_UP_TIME),
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
@@ -345,7 +345,7 @@ public class TimerUtils
|
|||||||
if (mainHandTime < HAND_UP_TIME)
|
if (mainHandTime < HAND_UP_TIME)
|
||||||
{
|
{
|
||||||
matrixStack
|
matrixStack
|
||||||
.translate(0,
|
.func_227861_a_(0,
|
||||||
(float) (-1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME),
|
(float) (-1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME),
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
||||||
modLoader="javafml" #mandatory
|
modLoader="javafml" #mandatory
|
||||||
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
||||||
loaderVersion="[31,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
loaderVersion="[28,)" #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.
|
# 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.
|
# 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"
|
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
|
# Does this dependency have to exist - if not, ordering below must be specified
|
||||||
mandatory=true #mandatory
|
mandatory=true #mandatory
|
||||||
# The version range of the dependency
|
# The version range of the dependency
|
||||||
versionRange="[31,)" #mandatory
|
versionRange="[28,)" #mandatory
|
||||||
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
|
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
# 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]]
|
[[dependencies.immersive_hud]]
|
||||||
modId="minecraft"
|
modId="minecraft"
|
||||||
mandatory=true
|
mandatory=true
|
||||||
versionRange="[1.15.2,1.16)"
|
versionRange="[1.15,1.15.2)"
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
side="CLIENT"
|
side="CLIENT"
|
||||||
|
|||||||
Reference in New Issue
Block a user