diff --git a/src/main/java/net/mcreator/target/client/screens/Mk42UIOverlay.java b/src/main/java/net/mcreator/target/client/screens/Mk42UIOverlay.java new file mode 100644 index 000000000..4212e210d --- /dev/null +++ b/src/main/java/net/mcreator/target/client/screens/Mk42UIOverlay.java @@ -0,0 +1,49 @@ +package net.mcreator.target.client.screens; + +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; +import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.network.TargetModVariables; +import net.minecraft.client.CameraType; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.RenderGuiEvent; +import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber({Dist.CLIENT}) +public class Mk42UIOverlay { + @SubscribeEvent(priority = EventPriority.NORMAL) + public static void eventHandler(RenderGuiEvent.Pre event) { + int w = event.getWindow().getGuiScaledWidth(); + int h = event.getWindow().getGuiScaledHeight(); + Player player = Minecraft.getInstance().player; + RenderSystem.disableDepthTest(); + RenderSystem.depthMask(false); + RenderSystem.enableBlend(); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + RenderSystem.setShaderColor(1, 1, 1, 1); + event.getGuiGraphics().blit(new ResourceLocation("target:textures/screens/mk_42_rex.png"), w / 2 + -406, h / 2 + -146, 0, 0, 813, 293, 813, 293); +// if (shouldRenderCrossHair(player)) { +// +// } + RenderSystem.depthMask(true); + RenderSystem.defaultBlendFunc(); + RenderSystem.enableDepthTest(); + RenderSystem.disableBlend(); + RenderSystem.setShaderColor(1, 1, 1, 1); + } + +// private static boolean shouldRenderCrossHair(Player player) { +// if (player == null) return false; +// return !player.isSpectator() +// && player.getMainHandItem().getItem() == TargetModItems.M_79.get() +// && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON +// && !player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.zooming).orElse(false); +// } +} diff --git a/src/main/java/net/mcreator/target/entity/Mk42Entity.java b/src/main/java/net/mcreator/target/entity/Mk42Entity.java index a441cdee6..2299565d3 100644 --- a/src/main/java/net/mcreator/target/entity/Mk42Entity.java +++ b/src/main/java/net/mcreator/target/entity/Mk42Entity.java @@ -269,7 +269,7 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { explosionRadius = 10; explosionDamage = 200; fireProbability = 0.18F; - fireTime = 100; + fireTime = 5; } if (stack.is(TargetModItems.AP_5_INCHES.get())) { diff --git a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java index 358bd66cd..5bdf98dc5 100644 --- a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java @@ -273,7 +273,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa this.setDeltaMovement(x - 0.02 * x, y - 0.02 * y - 0.05, z - 0.02 * z); this.tickCount++; - if (this.tickCount > 30) { + if (this.tickCount > 40) { this.discard(); } } diff --git a/src/main/resources/assets/target/textures/screens/mk_42_rex.png b/src/main/resources/assets/target/textures/screens/mk_42_rex.png new file mode 100644 index 000000000..6e5618331 Binary files /dev/null and b/src/main/resources/assets/target/textures/screens/mk_42_rex.png differ