From 75c206d68cbe6e3e236b3b5dcf39415271d8faa0 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Thu, 16 May 2024 15:17:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mcreator/target/TargetMod.java | 6 +- .../client/gui/GunRecycleGuiScreen.java | 11 ++- .../target/client/gui/MortarGUIScreen.java | 21 +++--- ...eParticle.java => BulletHoleParticle.java} | 9 +-- ...tarParticle.java => FireStarParticle.java} | 7 +- ...hairOverlay.java => CrossHairOverlay.java} | 2 +- .../target/client/screens/M79uiOverlay.java | 6 +- .../mcreator/target/entity/MortarEntity.java | 3 +- .../target/init/TargetModAttributes.java | 4 +- .../target/init/TargetModParticles.java | 8 +-- .../network/MortarGUIButtonMessage.java | 67 ++++++++----------- .../world/inventory/GunRecycleGuiMenu.java | 16 +++-- .../target/world/inventory/MortarGUIMenu.java | 17 ++--- 13 files changed, 77 insertions(+), 100 deletions(-) rename src/main/java/net/mcreator/target/client/particle/{BulltholeParticle.java => BulletHoleParticle.java} (78%) rename src/main/java/net/mcreator/target/client/particle/{FirestarParticle.java => FireStarParticle.java} (86%) rename src/main/java/net/mcreator/target/client/screens/{CrosshairOverlay.java => CrossHairOverlay.java} (99%) diff --git a/src/main/java/net/mcreator/target/TargetMod.java b/src/main/java/net/mcreator/target/TargetMod.java index 1845fd60d..24bb207f9 100644 --- a/src/main/java/net/mcreator/target/TargetMod.java +++ b/src/main/java/net/mcreator/target/TargetMod.java @@ -1,10 +1,7 @@ package net.mcreator.target; import net.mcreator.target.init.*; -import net.mcreator.target.network.DoubleJumpMessage; -import net.mcreator.target.network.FireMessage; -import net.mcreator.target.network.GunsDataMessage; -import net.mcreator.target.network.ZoomMessage; +import net.mcreator.target.network.*; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.MinecraftForge; @@ -87,5 +84,6 @@ public class TargetMod { addNetworkMessage(DoubleJumpMessage.class, DoubleJumpMessage::buffer, DoubleJumpMessage::new, DoubleJumpMessage::handler); addNetworkMessage(GunsDataMessage.class, GunsDataMessage::encode, GunsDataMessage::decode, GunsDataMessage::handler, Optional.of(NetworkDirection.PLAY_TO_CLIENT)); addNetworkMessage(FireMessage.class, FireMessage::buffer, FireMessage::new, FireMessage::handler); + addNetworkMessage(MortarGUIButtonMessage.class, MortarGUIButtonMessage::buffer, MortarGUIButtonMessage::new, MortarGUIButtonMessage::handler); } } diff --git a/src/main/java/net/mcreator/target/client/gui/GunRecycleGuiScreen.java b/src/main/java/net/mcreator/target/client/gui/GunRecycleGuiScreen.java index 03047ccc0..8fc881b3b 100644 --- a/src/main/java/net/mcreator/target/client/gui/GunRecycleGuiScreen.java +++ b/src/main/java/net/mcreator/target/client/gui/GunRecycleGuiScreen.java @@ -11,20 +11,17 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; import java.util.HashMap; public class GunRecycleGuiScreen extends AbstractContainerScreen { - private final static HashMap guistate = GunRecycleGuiMenu.guistate; - private final Level world; + private final static HashMap GUI_STATE = GunRecycleGuiMenu.GUI_STATE; private final int x, y, z; private final Player entity; Button button_dismantle; public GunRecycleGuiScreen(GunRecycleGuiMenu container, Inventory inventory, Component text) { super(container, inventory, text); - this.world = container.world; this.x = container.x; this.y = container.y; this.z = container.z; @@ -56,7 +53,9 @@ public class GunRecycleGuiScreen extends AbstractContainerScreen { - private final static HashMap guistate = MortarGUIMenu.guistate; - private final Level world; + private final static HashMap GUI_STATE = MortarGUIMenu.GUI_STATE; private final int x, y, z; private final Player entity; Button button_zeng_da_yang_jiao; @@ -32,7 +30,6 @@ public class MortarGUIScreen extends AbstractContainerScreen { public MortarGUIScreen(MortarGUIMenu container, Inventory inventory, Component text) { super(container, inventory, text); - this.world = container.world; this.x = container.x; this.y = container.y; this.z = container.z; @@ -62,7 +59,9 @@ public class MortarGUIScreen extends AbstractContainerScreen { @Override public boolean keyPressed(int key, int b, int c) { if (key == 256) { - this.minecraft.player.closeContainer(); + if (this.minecraft != null && this.minecraft.player != null) { + this.minecraft.player.closeContainer(); + } return true; } return super.keyPressed(key, b, c); @@ -102,37 +101,37 @@ public class MortarGUIScreen extends AbstractContainerScreen { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(0, x, y, z)); MortarGUIButtonMessage.handleButtonAction(entity, 0, x, y, z); }).bounds(this.leftPos + 42, this.topPos + 124, 29, 20).build(); - guistate.put("button:button_zeng_da_yang_jiao", button_zeng_da_yang_jiao); + GUI_STATE.put("button:button_zeng_da_yang_jiao", button_zeng_da_yang_jiao); this.addRenderableWidget(button_zeng_da_yang_jiao); button_empty = Button.builder(Component.translatable("gui.target.mortar_gui.button_empty"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(1, x, y, z)); MortarGUIButtonMessage.handleButtonAction(entity, 1, x, y, z); }).bounds(this.leftPos - 73, this.topPos + 124, 30, 20).build(); - guistate.put("button:button_empty", button_empty); + GUI_STATE.put("button:button_empty", button_empty); this.addRenderableWidget(button_empty); button_10 = Button.builder(Component.translatable("gui.target.mortar_gui.button_10"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(2, x, y, z)); MortarGUIButtonMessage.handleButtonAction(entity, 2, x, y, z); }).bounds(this.leftPos + 43, this.topPos + 151, 28, 20).build(); - guistate.put("button:button_10", button_10); + GUI_STATE.put("button:button_10", button_10); this.addRenderableWidget(button_10); button_101 = Button.builder(Component.translatable("gui.target.mortar_gui.button_101"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(3, x, y, z)); MortarGUIButtonMessage.handleButtonAction(entity, 3, x, y, z); }).bounds(this.leftPos - 73, this.topPos + 151, 30, 20).build(); - guistate.put("button:button_101", button_101); + GUI_STATE.put("button:button_101", button_101); this.addRenderableWidget(button_101); button_05 = Button.builder(Component.translatable("gui.target.mortar_gui.button_05"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(4, x, y, z)); MortarGUIButtonMessage.handleButtonAction(entity, 4, x, y, z); }).bounds(this.leftPos - 73, this.topPos + 97, 30, 20).build(); - guistate.put("button:button_05", button_05); + GUI_STATE.put("button:button_05", button_05); this.addRenderableWidget(button_05); button_051 = Button.builder(Component.translatable("gui.target.mortar_gui.button_051"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(5, x, y, z)); MortarGUIButtonMessage.handleButtonAction(entity, 5, x, y, z); }).bounds(this.leftPos + 42, this.topPos + 97, 29, 20).build(); - guistate.put("button:button_051", button_051); + GUI_STATE.put("button:button_051", button_051); this.addRenderableWidget(button_051); } } diff --git a/src/main/java/net/mcreator/target/client/particle/BulltholeParticle.java b/src/main/java/net/mcreator/target/client/particle/BulletHoleParticle.java similarity index 78% rename from src/main/java/net/mcreator/target/client/particle/BulltholeParticle.java rename to src/main/java/net/mcreator/target/client/particle/BulletHoleParticle.java index f88bbb29b..bff04ed96 100644 --- a/src/main/java/net/mcreator/target/client/particle/BulltholeParticle.java +++ b/src/main/java/net/mcreator/target/client/particle/BulletHoleParticle.java @@ -7,7 +7,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class BulltholeParticle extends TextureSheetParticle { +public class BulletHoleParticle extends TextureSheetParticle { public static BulltholeParticleProvider provider(SpriteSet spriteSet) { return new BulltholeParticleProvider(spriteSet); } @@ -20,15 +20,12 @@ public class BulltholeParticle extends TextureSheetParticle { } public Particle createParticle(SimpleParticleType typeIn, ClientLevel worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { - return new BulltholeParticle(worldIn, x, y, z, xSpeed, ySpeed, zSpeed, this.spriteSet); + return new BulletHoleParticle(worldIn, x, y, z, xSpeed, ySpeed, zSpeed, this.spriteSet); } } - private final SpriteSet spriteSet; - - protected BulltholeParticle(ClientLevel world, double x, double y, double z, double vx, double vy, double vz, SpriteSet spriteSet) { + protected BulletHoleParticle(ClientLevel world, double x, double y, double z, double vx, double vy, double vz, SpriteSet spriteSet) { super(world, x, y, z); - this.spriteSet = spriteSet; this.setSize(0f, 0f); this.lifetime = 100; this.gravity = 0f; diff --git a/src/main/java/net/mcreator/target/client/particle/FirestarParticle.java b/src/main/java/net/mcreator/target/client/particle/FireStarParticle.java similarity index 86% rename from src/main/java/net/mcreator/target/client/particle/FirestarParticle.java rename to src/main/java/net/mcreator/target/client/particle/FireStarParticle.java index f774f56a5..505abf392 100644 --- a/src/main/java/net/mcreator/target/client/particle/FirestarParticle.java +++ b/src/main/java/net/mcreator/target/client/particle/FireStarParticle.java @@ -7,7 +7,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class FirestarParticle extends TextureSheetParticle { +public class FireStarParticle extends TextureSheetParticle { public static FirestarParticleProvider provider(SpriteSet spriteSet) { return new FirestarParticleProvider(spriteSet); } @@ -20,14 +20,13 @@ public class FirestarParticle extends TextureSheetParticle { } public Particle createParticle(SimpleParticleType typeIn, ClientLevel worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { - FirestarParticle particle = new FirestarParticle(worldIn, x, y, z, xSpeed, ySpeed, zSpeed, this.spriteSet); - return particle; + return new FireStarParticle(worldIn, x, y, z, xSpeed, ySpeed, zSpeed, this.spriteSet); } } private final SpriteSet spriteSet; - protected FirestarParticle(ClientLevel world, double x, double y, double z, double vx, double vy, double vz, SpriteSet spriteSet) { + protected FireStarParticle(ClientLevel world, double x, double y, double z, double vx, double vy, double vz, SpriteSet spriteSet) { super(world, x, y, z); this.spriteSet = spriteSet; this.setSize(0.2f, 0.2f); diff --git a/src/main/java/net/mcreator/target/client/screens/CrosshairOverlay.java b/src/main/java/net/mcreator/target/client/screens/CrossHairOverlay.java similarity index 99% rename from src/main/java/net/mcreator/target/client/screens/CrosshairOverlay.java rename to src/main/java/net/mcreator/target/client/screens/CrossHairOverlay.java index ac70103b0..c45bfa307 100644 --- a/src/main/java/net/mcreator/target/client/screens/CrosshairOverlay.java +++ b/src/main/java/net/mcreator/target/client/screens/CrossHairOverlay.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.common.Mod; import org.joml.Matrix4f; @Mod.EventBusSubscriber({Dist.CLIENT}) -public class CrosshairOverlay { +public class CrossHairOverlay { @SubscribeEvent(priority = EventPriority.NORMAL) public static void eventHandler(RenderGuiEvent.Pre event) { int w = event.getWindow().getGuiScaledWidth(); diff --git a/src/main/java/net/mcreator/target/client/screens/M79uiOverlay.java b/src/main/java/net/mcreator/target/client/screens/M79uiOverlay.java index a50dff056..195bcc1f4 100644 --- a/src/main/java/net/mcreator/target/client/screens/M79uiOverlay.java +++ b/src/main/java/net/mcreator/target/client/screens/M79uiOverlay.java @@ -28,8 +28,8 @@ public class M79uiOverlay { 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); - if (shouldRenderCrosshair(player)) { - event.getGuiGraphics().blit(new ResourceLocation("target:textures/screens/rex.png"), w / 2 + -16, h / 2 + -16, 0, 0, 32, 32, 32, 32); + if (shouldRenderCrossHair(player)) { + event.getGuiGraphics().blit(new ResourceLocation("target:textures/screens/rex.png"), w / 2 - 16, h / 2 - 16, 0, 0, 32, 32, 32, 32); } RenderSystem.depthMask(true); RenderSystem.defaultBlendFunc(); @@ -38,7 +38,7 @@ public class M79uiOverlay { RenderSystem.setShaderColor(1, 1, 1, 1); } - private static boolean shouldRenderCrosshair(Player player) { + private static boolean shouldRenderCrossHair(Player player) { if (player == null) return false; return !player.isSpectator() && player.getMainHandItem().getItem() == TargetModItems.M_79.get() diff --git a/src/main/java/net/mcreator/target/entity/MortarEntity.java b/src/main/java/net/mcreator/target/entity/MortarEntity.java index ceb996a5b..bb78b2e6e 100644 --- a/src/main/java/net/mcreator/target/entity/MortarEntity.java +++ b/src/main/java/net/mcreator/target/entity/MortarEntity.java @@ -53,7 +53,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import javax.annotation.Nullable; -import java.text.DecimalFormat; public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEntity { public static final EntityDataAccessor SHOOT = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.BOOLEAN); @@ -104,7 +103,7 @@ public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEn @Override public MobType getMobType() { - return MobType.UNDEFINED; + return super.getMobType(); } @Override diff --git a/src/main/java/net/mcreator/target/init/TargetModAttributes.java b/src/main/java/net/mcreator/target/init/TargetModAttributes.java index e20672f8e..5be3b708e 100644 --- a/src/main/java/net/mcreator/target/init/TargetModAttributes.java +++ b/src/main/java/net/mcreator/target/init/TargetModAttributes.java @@ -22,9 +22,7 @@ public class TargetModAttributes { @SubscribeEvent public static void register(FMLConstructModEvent event) { - event.enqueueWork(() -> { - ATTRIBUTES.register(FMLJavaModLoadingContext.get().getModEventBus()); - }); + event.enqueueWork(() -> ATTRIBUTES.register(FMLJavaModLoadingContext.get().getModEventBus())); } @SubscribeEvent diff --git a/src/main/java/net/mcreator/target/init/TargetModParticles.java b/src/main/java/net/mcreator/target/init/TargetModParticles.java index dc86c3a06..7e5f8b8ca 100644 --- a/src/main/java/net/mcreator/target/init/TargetModParticles.java +++ b/src/main/java/net/mcreator/target/init/TargetModParticles.java @@ -1,7 +1,7 @@ package net.mcreator.target.init; -import net.mcreator.target.client.particle.BulltholeParticle; -import net.mcreator.target.client.particle.FirestarParticle; +import net.mcreator.target.client.particle.BulletHoleParticle; +import net.mcreator.target.client.particle.FireStarParticle; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RegisterParticleProvidersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -11,8 +11,8 @@ import net.minecraftforge.fml.common.Mod; public class TargetModParticles { @SubscribeEvent public static void registerParticles(RegisterParticleProvidersEvent event) { - event.registerSpriteSet(TargetModParticleTypes.FIRESTAR.get(), FirestarParticle::provider); - event.registerSpriteSet(TargetModParticleTypes.BULLTHOLE.get(), BulltholeParticle::provider); + event.registerSpriteSet(TargetModParticleTypes.FIRESTAR.get(), FireStarParticle::provider); + event.registerSpriteSet(TargetModParticleTypes.BULLTHOLE.get(), BulletHoleParticle::provider); } } diff --git a/src/main/java/net/mcreator/target/network/MortarGUIButtonMessage.java b/src/main/java/net/mcreator/target/network/MortarGUIButtonMessage.java index 155e04eaf..fcfb4e9af 100644 --- a/src/main/java/net/mcreator/target/network/MortarGUIButtonMessage.java +++ b/src/main/java/net/mcreator/target/network/MortarGUIButtonMessage.java @@ -1,24 +1,17 @@ package net.mcreator.target.network; -import net.mcreator.target.TargetMod; +import net.mcreator.target.init.TargetModAttributes; import net.mcreator.target.tools.TraceTool; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.network.NetworkEvent; -import net.minecraft.world.entity.LivingEntity; - -import net.mcreator.target.init.TargetModAttributes; - import java.util.function.Supplier; -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class MortarGUIButtonMessage { private final int buttonID, x, y, z; @@ -68,43 +61,39 @@ public class MortarGUIButtonMessage { private static void handleButtonAction(Player player, int buttonID) { Entity looking = TraceTool.findLookingEntity(player, 6); if (looking == null) return; - - switch (buttonID) { - case 0 -> { - if (((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() < 89) { - ((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() + 1)); + if (looking instanceof LivingEntity living) { + switch (buttonID) { + case 0 -> { + if (living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() < 89) { + living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() + 1)); + } } - } - case 1 -> { - if (((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() > 21) { - ((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() - 1)); + case 1 -> { + if (living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() > 21) { + living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() - 1)); + } } - } - case 2 -> { - if (((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() < 78) { - ((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() + 10)); + case 2 -> { + if (living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() < 78) { + living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() + 10)); + } } - } - case 3 -> { - if (((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() > 31) { - ((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() - 10)); + case 3 -> { + if (living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() > 31) { + living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() - 10)); + } } - } - case 4 -> { - if (((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() > 20.5) { - ((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() - 0.5)); + case 4 -> { + if (living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() > 20.5) { + living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() - 0.5)); + } } - } - case 5 -> { - if (((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() < 88.5) { - ((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((((LivingEntity) looking).getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() + 0.5)); + case 5 -> { + if (living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() < 88.5) { + living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).setBaseValue((living.getAttribute(TargetModAttributes.MORTAR_PITCH.get()).getBaseValue() + 0.5)); + } } } } } - - @SubscribeEvent - public static void registerMessage(FMLCommonSetupEvent event) { - TargetMod.addNetworkMessage(MortarGUIButtonMessage.class, MortarGUIButtonMessage::buffer, MortarGUIButtonMessage::new, MortarGUIButtonMessage::handler); - } } diff --git a/src/main/java/net/mcreator/target/world/inventory/GunRecycleGuiMenu.java b/src/main/java/net/mcreator/target/world/inventory/GunRecycleGuiMenu.java index ec3e6fd11..c9830d7bb 100644 --- a/src/main/java/net/mcreator/target/world/inventory/GunRecycleGuiMenu.java +++ b/src/main/java/net/mcreator/target/world/inventory/GunRecycleGuiMenu.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.function.Supplier; public class GunRecycleGuiMenu extends AbstractContainerMenu implements Supplier> { - public final static HashMap guistate = new HashMap<>(); + public final static HashMap GUI_STATE = new HashMap<>(); public final Level world; public final Player entity; public int x, y, z; @@ -49,6 +49,7 @@ public class GunRecycleGuiMenu extends AbstractContainerMenu implements Supplier this.z = pos.getZ(); access = ContainerLevelAccess.create(world, pos); } + if (pos != null) { if (extraData.readableBytes() == 1) { // bound to item byte hand = extraData.readByte(); @@ -75,18 +76,23 @@ public class GunRecycleGuiMenu extends AbstractContainerMenu implements Supplier }); } } - this.customSlots.put(0, this.addSlot(new SlotItemHandler(internal, 0, 79, 27) { + this.customSlots.put(0, this.addSlot(new SlotItemHandler(internal, 0, 79, 27) { @Override public boolean mayPlace(ItemStack stack) { return stack.is(TargetModTags.Items.GUN); } })); - for (int si = 0; si < 3; ++si) - for (int sj = 0; sj < 9; ++sj) + + for (int si = 0; si < 3; ++si) { + for (int sj = 0; sj < 9; ++sj) { this.addSlot(new Slot(inv, sj + (si + 1) * 9, 8 + sj * 18, 84 + si * 18)); - for (int si = 0; si < 9; ++si) + } + } + + for (int si = 0; si < 9; ++si) { this.addSlot(new Slot(inv, si, 8 + si * 18, 142)); + } } @Override diff --git a/src/main/java/net/mcreator/target/world/inventory/MortarGUIMenu.java b/src/main/java/net/mcreator/target/world/inventory/MortarGUIMenu.java index 22586f277..ece528fb9 100644 --- a/src/main/java/net/mcreator/target/world/inventory/MortarGUIMenu.java +++ b/src/main/java/net/mcreator/target/world/inventory/MortarGUIMenu.java @@ -15,7 +15,6 @@ import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -28,34 +27,28 @@ import java.util.function.Supplier; @Mod.EventBusSubscriber public class MortarGUIMenu extends AbstractContainerMenu implements Supplier> { - public final static HashMap guistate = new HashMap<>(); + public final static HashMap GUI_STATE = new HashMap<>(); public final Level world; public final Player entity; public int x, y, z; - private ContainerLevelAccess access = ContainerLevelAccess.NULL; - private final IItemHandler internal; private final Map customSlots = new HashMap<>(); - private final boolean bound = false; - private final Supplier boundItemMatcher = null; - private final Entity boundEntity = null; - private final BlockEntity boundBlockEntity = null; public MortarGUIMenu(int id, Inventory inv, FriendlyByteBuf extraData) { super(TargetModMenus.MORTAR_GUI.get(), id); this.entity = inv.player; this.world = inv.player.level(); - this.internal = new ItemStackHandler(0); + IItemHandler internal = new ItemStackHandler(0); if (extraData != null) { BlockPos pos = extraData.readBlockPos(); this.x = pos.getX(); this.y = pos.getY(); this.z = pos.getZ(); - access = ContainerLevelAccess.create(world, pos); + ContainerLevelAccess access = ContainerLevelAccess.create(world, pos); } Entity looking = TraceTool.findLookingEntity(entity, 6); if (looking == null) return; - if (guistate.get("text:pitch") instanceof EditBox box) + if (GUI_STATE.get("text:pitch") instanceof EditBox box) box.setValue((new java.text.DecimalFormat("##").format(-looking.getXRot()))); } @@ -80,7 +73,7 @@ public class MortarGUIMenu extends AbstractContainerMenu implements Supplier