Skip to content

Commit

Permalink
Update to 1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
@IzzelAliz
IzzelAliz committed Jun 8, 2023
1 parent c0e8ef1 commit ba002dd
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 47 deletions.
8 changes: 4 additions & 4 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'eclipse'
id 'maven-publish'
id 'net.minecraftforge.gradle' version '5.1.+'
id 'com.github.johnrengelman.shadow' version '7.1.+'
id 'net.minecraftforge.gradle' version '6.0.+'
id 'com.github.johnrengelman.shadow' version '8.1.+'
}

apply from: 'gradle/teacon-forge.gradle'
Expand All @@ -12,13 +12,13 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
// definitions at gradle/teacon-forge.gradle
teacon {
modId = 'slide_show'
modVersion = '0.7.4'
modVersion = '0.8.0'
modLicense = 'BSD-3-Clause'
modGitHubRepo = 'teaconmc/SlideShow'
modAuthors = ['BloCamLimb', '3TUSK', 'ustc-zzzz']
modDescription = 'Minecraft mod, adding a projector that can display online images.'

platform = 'forge-1.19.4-45.0.9'
platform = 'forge-1.20-46.0.1'
// parchment = '2022.03.13'

// uncomment these lines if you need
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions src/main/java/org/teacon/slides/ModRegistries.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraftforge.common.CreativeModeTabRegistry;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
Expand Down Expand Up @@ -110,7 +110,7 @@ public static void setupCommon(final FMLCommonSetupEvent event) {
}

@SubscribeEvent
public static void onBuildContents(CreativeModeTabEvent.BuildContents event) {
public static void onBuildContents(BuildCreativeModeTabContentsEvent event) {
var tabName = CreativeModeTabRegistry.getName(event.getTab());
if (new ResourceLocation("minecraft", "tools_and_utilities").equals(tabName)) {
event.accept(PROJECTOR);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/teacon/slides/admin/SlideCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private static int prefetch(CommandSourceStack source,
var uuid = uuidOptional.orElseGet(() -> data.getOrCreateIdByCommand(url, source));
new ProjectorURLPrefetchPacket(Set.of(uuid), data).sendToAll();
var msg = Component.translatable("command.slide_show.prefetch_projector_url.success", toText(uuid, url));
source.sendSuccess(msg.withStyle(ChatFormatting.GREEN), true);
source.sendSuccess(() -> msg.withStyle(ChatFormatting.GREEN), true);
return Command.SINGLE_SUCCESS;
}
}
Expand All @@ -107,7 +107,7 @@ private static int list(CommandSourceStack source,
}
var component = ComponentUtils.formatList(components, Function.identity());
var msg = Component.translatable("command.slide_show.list_projector_url.success", matchCount, component);
source.sendSuccess(msg.withStyle(ChatFormatting.GREEN), true);
source.sendSuccess(() -> msg.withStyle(ChatFormatting.GREEN), true);
return Command.SINGLE_SUCCESS;
}
throw PERM_NOT_EXIST.create();
Expand All @@ -123,7 +123,7 @@ private static int block(CommandSourceStack source,
var text = toText(pair.getKey(), pair.getValue());
if (data.setBlockedStatusByCommand(pair.getKey(), pair.getValue(), source, true)) {
var msg = Component.translatable("command.slide_show.block_projector_url.success", text);
source.sendSuccess(msg.withStyle(ChatFormatting.GREEN), true);
source.sendSuccess(() -> msg.withStyle(ChatFormatting.GREEN), true);
return Command.SINGLE_SUCCESS;
}
}
Expand All @@ -142,7 +142,7 @@ private static int unblock(CommandSourceStack source,
var text = toText(pair.getKey(), pair.getValue());
if (data.setBlockedStatusByCommand(pair.getKey(), pair.getValue(), source, false)) {
var msg = Component.translatable("command.slide_show.unblock_projector_url.success", text);
source.sendSuccess(msg.withStyle(ChatFormatting.GREEN), true);
source.sendSuccess(() -> msg.withStyle(ChatFormatting.GREEN), true);
return Command.SINGLE_SUCCESS;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/teacon/slides/network/ProjectorURLRequestPacket.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void handle(Supplier<NetworkEvent.Context> context) {
context.get().enqueueWork(() -> {
var player = context.get().getSender();
if (player != null) {
var level = player.getLevel();
var level = player.serverLevel();
var imageLocations = new LinkedHashSet<UUID>(this.requestedPosSet.size());
for (var pos : this.requestedPosSet) {
// prevent remote chunk loading
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/teacon/slides/network/ProjectorUpdatePacket.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void handle(Supplier<NetworkEvent.Context> context) {
context.get().enqueueWork(() -> {
var player = context.get().getSender();
if (SlidePermission.canInteract(player)) {
var level = player.getLevel();
var level = player.serverLevel();
var globalPos = GlobalPos.of(level.dimension(), this.pos);
// prevent remote chunk loading
if (level.isLoaded(this.pos) && level.getBlockEntity(this.pos) instanceof ProjectorBlockEntity tile) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/teacon/slides/projector/ProjectorBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition.Builder;
import net.minecraft.world.level.block.state.properties.EnumProperty;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
Expand Down Expand Up @@ -51,7 +50,7 @@ public final class ProjectorBlock extends Block implements EntityBlock {
private static final VoxelShape SHAPE_WITH_BASE_DOWN = Block.box(0.0, 0.0, 0.0, 16.0, 12.0, 16.0);

public ProjectorBlock() {
super(Block.Properties.of(Material.METAL)
super(Block.Properties.of() // TODO 1.20 material
.strength(20F)
.lightLevel(state -> 15) // TODO Configurable
.noCollission());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/teacon/slides/projector/ProjectorBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public CompoundTag getUpdateTag() {
if (currentPlayer instanceof ServerPlayer player) {
var canInteract = SlidePermission.canInteract(player);
if (canInteract) {
var data = ProjectorURLSavedData.get(player.getLevel());
var data = ProjectorURLSavedData.get(player.serverLevel());
var canCreate = SlidePermission.canInteractCreateUrl(currentPlayer);
return new ProjectorContainerMenu(id, new ProjectorUpdatePacket(this, canCreate, data::getUrlById));
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/teacon/slides/projector/ProjectorContainerMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public ProjectorContainerMenu(int containerId, Inventory inventory, FriendlyByte

public static void openGui(Player currentPlayer, ProjectorBlockEntity tile) {
var player = (ServerPlayer) currentPlayer;
var data = ProjectorURLSavedData.get(player.getLevel());
var data = ProjectorURLSavedData.get(player.serverLevel());
var canCreate = SlidePermission.canInteractCreateUrl(currentPlayer);
NetworkHooks.openScreen(player, tile, new ProjectorUpdatePacket(tile, canCreate, data::getUrlById)::write);
}
Expand All @@ -52,7 +52,7 @@ public ItemStack quickMoveStack(Player p_38941_, int p_38942_) {

@Override
public boolean stillValid(Player player) {
var level = player.getLevel();
var level = player.level();
if (!level.isLoaded(this.updatePacket.pos)) {
return false;
}
Expand Down
55 changes: 27 additions & 28 deletions src/main/java/org/teacon/slides/screen/ProjectorScreen.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.teacon.slides.screen;

import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
import net.minecraft.FieldsAreNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.AbstractButton;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.narration.NarratedElementType;
Expand Down Expand Up @@ -446,18 +446,18 @@ public boolean keyPressed(int keyCode, int scanCode, int modifier) {
}

@Override
protected void renderBg(PoseStack stack, float partialTicks, int mouseX, int mouseY) {
renderBackground(stack);
protected void renderBg(GuiGraphics gui, float partialTicks, int mouseX, int mouseY) {
renderBackground(gui);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.setShaderTexture(0, GUI_TEXTURE);
blit(stack, leftPos, topPos, 0, 0, imageWidth, imageHeight);
gui.blit(GUI_TEXTURE, leftPos, topPos, 0, 0, imageWidth, imageHeight);
if (mImageUrlStatus == ImageUrlStatus.INVALID || mImageUrlStatus == ImageUrlStatus.BLOCKED) {
blit(stack, leftPos + 9, topPos + 27, 179, 53, 18, 19);
gui.blit(GUI_TEXTURE, leftPos + 9, topPos + 27, 179, 53, 18, 19);
}
}

@Override
protected void renderLabels(PoseStack stack, int mouseX, int mouseY) {
protected void renderLabels(GuiGraphics gui, int mouseX, int mouseY) {
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.setShaderTexture(0, GUI_TEXTURE);
Expand All @@ -466,40 +466,40 @@ protected void renderLabels(PoseStack stack, int mouseX, int mouseY) {
if (alpha > 0) {
int red = (mImageColor >> 16) & 255, green = (mImageColor >> COLOR_MAX_LENGTH) & 255, blue = mImageColor & 255;
RenderSystem.setShaderColor(red / 255.0F, green / 255.0F, blue / 255.0F, alpha / 255.0F);
blit(stack, 38, 157, 180, 194, 10, 10);
blit(stack, 82, 185, 180, 194, 17, 17);
gui.blit(GUI_TEXTURE, 38, 157, 180, 194, 10, 10);
gui.blit(GUI_TEXTURE, 82, 185, 180, 194, 17, 17);
}

RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
blit(stack, 82, 185, 202, 194 - mRotation.ordinal() * 20, 17, 17);
gui.blit(GUI_TEXTURE, 82, 185, 202, 194 - mRotation.ordinal() * 20, 17, 17);

drawCenteredStringWithoutShadow(stack, font, IMAGE_TEXT, 12);
drawCenteredStringWithoutShadow(stack, font, OFFSET_TEXT, 86);
drawCenteredStringWithoutShadow(stack, font, OTHERS_TEXT, 138);
drawCenteredStringWithoutShadow(gui, font, IMAGE_TEXT, 12);
drawCenteredStringWithoutShadow(gui, font, OFFSET_TEXT, 86);
drawCenteredStringWithoutShadow(gui, font, OTHERS_TEXT, 138);

int offsetX = mouseX - leftPos, offsetY = mouseY - topPos;
if (offsetX >= 9 && offsetY >= 27 && offsetX < 27 && offsetY < 46) {
renderComponentTooltip(stack, this.getUrlTexts(), offsetX, offsetY);
gui.renderComponentTooltip(font, this.getUrlTexts(), offsetX, offsetY);
} else if (offsetX >= 34 && offsetY >= 153 && offsetX < 52 && offsetY < 172) {
renderTooltip(stack, COLOR_TEXT, offsetX, offsetY);
gui.renderTooltip(font, COLOR_TEXT, offsetX, offsetY);
} else if (offsetX >= 9 && offsetY >= 49 && offsetX < 27 && offsetY < 68) {
renderTooltip(stack, WIDTH_TEXT, offsetX, offsetY);
gui.renderTooltip(font, WIDTH_TEXT, offsetX, offsetY);
} else if (offsetX >= 79 && offsetY >= 49 && offsetX < 97 && offsetY < 68) {
renderTooltip(stack, HEIGHT_TEXT, offsetX, offsetY);
gui.renderTooltip(font, HEIGHT_TEXT, offsetX, offsetY);
} else if (offsetX >= 149 && offsetY >= 49 && offsetX < 167 && offsetY < 68) {
renderTooltip(stack, KEEP_ASPECT_RATIO_TEXT, offsetX, offsetY);
gui.renderTooltip(font, KEEP_ASPECT_RATIO_TEXT, offsetX, offsetY);
} else if (offsetX >= 9 && offsetY >= 101 && offsetX < 27 && offsetY < 120) {
renderTooltip(stack, OFFSET_X_TEXT, offsetX, offsetY);
gui.renderTooltip(font, OFFSET_X_TEXT, offsetX, offsetY);
} else if (offsetX >= 63 && offsetY >= 101 && offsetX < 81 && offsetY < 120) {
renderTooltip(stack, OFFSET_Y_TEXT, offsetX, offsetY);
gui.renderTooltip(font, OFFSET_Y_TEXT, offsetX, offsetY);
} else if (offsetX >= 117 && offsetY >= 101 && offsetX < 135 && offsetY < 120) {
renderTooltip(stack, OFFSET_Z_TEXT, offsetX, offsetY);
gui.renderTooltip(font, OFFSET_Z_TEXT, offsetX, offsetY);
} else if (offsetX >= 117 && offsetY >= 153 && offsetX < 135 && offsetY < 172) {
renderTooltip(stack, FLIP_TEXT, offsetX, offsetY);
gui.renderTooltip(font, FLIP_TEXT, offsetX, offsetY);
} else if (offsetX >= 142 && offsetY >= 153 && offsetX < 160 && offsetY < 172) {
renderTooltip(stack, ROTATE_TEXT, offsetX, offsetY);
gui.renderTooltip(font, ROTATE_TEXT, offsetX, offsetY);
} else if (offsetX >= 9 && offsetY >= 153 && offsetX < 27 && offsetY < 172) {
renderTooltip(stack, SINGLE_DOUBLE_SIDED_TEXT, offsetX, offsetY);
gui.renderTooltip(font, SINGLE_DOUBLE_SIDED_TEXT, offsetX, offsetY);
}
}

Expand Down Expand Up @@ -563,8 +563,8 @@ private List<Component> getUrlTexts() {
return components;
}

private static void drawCenteredStringWithoutShadow(PoseStack stack, Font renderer, Component string, int y) {
renderer.draw(stack, string, 88 - renderer.width(string) / 2.0F, y, 0x404040);
private static void drawCenteredStringWithoutShadow(GuiGraphics gui, Font renderer, Component string, int y) {
gui.drawString(renderer, string.getVisualOrderText(), (88 - renderer.width(string) / 2.0F), y, 0x404040, false);
}

private static float parseFloat(String text) {
Expand Down Expand Up @@ -631,12 +631,11 @@ public void onPress() {
}

@Override
public void renderWidget(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
public void renderWidget(GuiGraphics gui, int mouseX, int mouseY, float partialTicks) {
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.setShaderTexture(0, GUI_TEXTURE);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
blit(stack, getX(), getY(), u, v, width, height);
gui.blit(GUI_TEXTURE, getX(), getY(), u, v, width, height);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/teacon/slides/url/ProjectorURLSavedData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static ProjectorURLSavedData get(ServerLevel level) {
@SubscribeEvent
public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) {
if (event.getEntity() instanceof ServerPlayer player) {
var data = get(player.getLevel());
var data = get(player.serverLevel());
data.sendSummaryToPlayer(player);
}
}
Expand Down

0 comments on commit ba002dd

Please sign in to comment.