MinecraftMods/Thresholds
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Backport to 1.18.2

Browse source
This commit is contained in:
zontreck 2024-01-17 02:25:27 -07:00
parent 1fbd10471f
commit c344b5c0b6
67 changed files with 3335 additions and 3858 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/dev/zontreck/otemod/implementation/vault/StarterContainer.java
View file

@ -73,7 +73,7 @@ public class StarterContainer
if(invalid)return;
boolean isEmpty=true;
CompoundTag saved = myInventory.serializeNBT();
ChatHelpers.broadcastToAbove(owner, Component.literal(ChatColor.BOLD+ChatColor.DARK_GREEN+"Saving the starter kit's contents..."), server);
ChatHelpers.broadcastToAbove(owner, ChatHelpers.macro(ChatColor.BOLD+ChatColor.DARK_GREEN+"Saving the starter kit's contents..."), server);
main_accessor.setLastChanged(Instant.now().getEpochSecond());

12
src/main/java/dev/zontreck/otemod/implementation/vault/StarterScreen.java
View file

@ -1,12 +1,8 @@
package dev.zontreck.otemod.implementation.vault;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.networking.ModMessages;
import dev.zontreck.otemod.networking.packets.OpenStarterVaultC2SPacket;
import dev.zontreck.otemod.networking.packets.OpenVaultC2SPacket;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@ -39,7 +35,7 @@ public class StarterScreen extends AbstractContainerScreen <StarterMenu>
}
@Override
public void render(GuiGraphics stack, int mouseX, int mouseY, float partialTicks)
public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks)
{
this.renderBackground(stack);
super.render(stack, mouseX, mouseY, partialTicks);
@ -58,13 +54,13 @@ public class StarterScreen extends AbstractContainerScreen <StarterMenu>
@Override
protected void renderBg(GuiGraphics pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY)
protected void renderBg(PoseStack pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY)
{
renderBackground(pGuiGraphics);
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor (1.0f, 1.0f, 1.0f, 1.0f);
RenderSystem.setShaderTexture(0, TEXTURE);
pGuiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
blit(pGuiGraphics, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
}
}

2
src/main/java/dev/zontreck/otemod/implementation/vault/VaultContainer.java
View file

@ -78,7 +78,7 @@ public class VaultContainer
if(VAULT_NUMBER == -1)return; // We have no need to save the trash
boolean isEmpty=true;
CompoundTag saved = myInventory.serializeNBT();
ChatHelpers.broadcastToAbove(owner, Component.literal(ChatColor.BOLD+ChatColor.DARK_GREEN+"Saving the vault's contents..."), server);
ChatHelpers.broadcastToAbove(owner, ChatHelpers.macro(ChatColor.BOLD+ChatColor.DARK_GREEN+"Saving the vault's contents..."), server);
Profile profile=null;
try {

22
src/main/java/dev/zontreck/otemod/implementation/vault/VaultScreen.java
View file

@ -5,14 +5,11 @@ import java.util.UUID;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.commands.vaults.VaultCommand;
import dev.zontreck.otemod.networking.ModMessages;
import dev.zontreck.otemod.networking.packets.OpenVaultC2SPacket;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.Button.OnPress;
import net.minecraft.client.gui.font.TextFieldHelper;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@ -46,7 +43,7 @@ public class VaultScreen extends AbstractContainerScreen <VaultMenu>
}
@Override
public void render(GuiGraphics stack, int mouseX, int mouseY, float partialTicks)
public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks)
{
this.renderBackground(stack);
super.render(stack, mouseX, mouseY, partialTicks);
@ -64,28 +61,31 @@ public class VaultScreen extends AbstractContainerScreen <VaultMenu>
// This is where custom controls would be added!
this.addWidget(Button.builder(Component.literal(""), (BTN)->{
this.addWidget(new Button(this.leftPos + 7, this.topPos + 86, 16, 16, ChatHelpers.macro(""), (BTN)->{
thePlayer.closeContainer();
ModMessages.sendToServer(new OpenVaultC2SPacket(0, true, -1));
}).size(16,16).pos(this.leftPos+7, this.topPos+86).build());
}));
this.addWidget(Button.builder(Component.literal(""), (BTN)->{
this.addWidget(new Button(this.leftPos + 187, this.topPos + 88, 16, 16, ChatHelpers.macro(""), (BTN)->{
thePlayer.closeContainer();
ModMessages.sendToServer(new OpenVaultC2SPacket(0, true, 1));
}).size(16,16).pos(this.leftPos+187, this.topPos+84).build());
}));
}
@Override
protected void renderBg(GuiGraphics pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY)
protected void renderBg(PoseStack pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY)
{
renderBackground(pGuiGraphics);
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor (1.0f, 1.0f, 1.0f, 1.0f);
RenderSystem.setShaderTexture(0, TEXTURE);
pGuiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
blit(pGuiGraphics, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
}
}

3
src/main/java/dev/zontreck/otemod/implementation/vault/VaultWatcher.java
View file

@ -3,6 +3,7 @@ package dev.zontreck.otemod.implementation.vault;
import java.util.Map;
import java.util.UUID;
import dev.zontreck.libzontreck.util.ServerUtilities;
import dev.zontreck.otemod.OTEMod;
import net.minecraftforge.client.event.ContainerScreenEvent;
import net.minecraftforge.event.entity.player.PlayerContainerEvent;
@ -16,7 +17,7 @@ public class VaultWatcher {
@SubscribeEvent
public void onClosedContainer(PlayerContainerEvent.Close ev)
{
if(ev.getEntity().level().isClientSide)return;
if(ServerUtilities.isClient()) return;
//OTEMod.LOGGER.info("Player closed a container");
// Player closed the container
// Check if it is a vault Container