Skip to content

Commit 25f1061

Browse files
falseresyncfalseresync
committed
Update to 1.21.11
1 parent 3495d86 commit 25f1061

15 files changed

Lines changed: 230 additions & 221 deletions

‎src/main/java/falseresync/vivatech/client/gui/InventoryComponentTooltip.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import net.minecraft.client.gui.Font;
55
import net.minecraft.client.gui.GuiGraphics;
66
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
7+
import net.minecraft.client.renderer.RenderPipelines;
78
import net.minecraft.resources.Identifier;
89
import net.minecraft.world.item.ItemStack;
910

@@ -19,12 +20,12 @@ public InventoryComponentTooltip(InventoryComponent inventoryComponent) {
1920
}
2021

2122
@Override
22-
public int getHeight() {
23+
public int getHeight(Font font) {
2324
return getRowsHeight() + BOTTOM_MARGIN;
2425
}
2526

2627
@Override
27-
public int getWidth(Font textRenderer) {
28+
public int getWidth(Font font) {
2829
return getColumnsWidth();
2930
}
3031

@@ -37,17 +38,17 @@ private int getRowsHeight() {
3738
}
3839

3940
@Override
40-
public void renderImage(Font textRenderer, int x, int y, GuiGraphics context) {
41+
public void renderImage(Font font, int x, int y, int k, int l, GuiGraphics guiGraphics) {
4142
int columns = getColumns();
4243
int rows = getRows();
43-
context.blitSprite(BACKGROUND_TEXTURE, x, y, this.getColumnsWidth(), this.getRowsHeight());
44+
guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, BACKGROUND_TEXTURE, x, y, this.getColumnsWidth(), this.getRowsHeight());
4445

4546
int slotIndex = 0;
4647
for (int row = 0; row < rows; row++) {
4748
for (int column = 0; column < columns; column++) {
4849
int slotX = x + column * 18 + 1;
4950
int slotY = y + row * 20 + 1;
50-
drawSlot(slotX, slotY, slotIndex++, context, textRenderer);
51+
drawSlot(slotX, slotY, slotIndex++, guiGraphics, font);
5152
}
5253
}
5354
}
@@ -64,7 +65,7 @@ private void drawSlot(int x, int y, int index, GuiGraphics context, Font textRen
6465
}
6566

6667
private void drawSprite(GuiGraphics context, int x, int y, SlotSprite sprite) {
67-
context.blitSprite(sprite.texture, x, y, 0, sprite.width, sprite.height);
68+
context.blitSprite(RenderPipelines.GUI_TEXTURED, sprite.texture, x, y, 0, sprite.width, sprite.height);
6869
}
6970

7071
private int getColumns() {

‎src/main/java/falseresync/vivatech/client/hud/ChargeDisplayHudItem.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.mojang.blaze3d.systems.RenderSystem;
44
import falseresync.lib.client.BetterDrawContext;
55
import falseresync.lib.math.Easing;
6-
import falseresync.vivatech.client.hud.HudItem;
76
import falseresync.vivatech.common.data.VivatechComponents;
87
import net.minecraft.client.DeltaTracker;
98
import net.minecraft.client.Minecraft;

‎src/main/java/falseresync/vivatech/client/rendering/VivatechRendering.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
import falseresync.vivatech.client.rendering.entity.EnergyVeilFeatureRenderer;
77
import falseresync.vivatech.client.rendering.entity.EnergyVeilModel;
88
import falseresync.vivatech.client.rendering.entity.StarProjectileRenderer;
9+
import falseresync.vivatech.client.rendering.item.FocusPlatingModelProperty;
910
import falseresync.vivatech.client.rendering.trinket.InspectorGogglesRenderer;
1011
import falseresync.vivatech.client.rendering.world.CometWarpBeaconRenderer;
1112
import falseresync.vivatech.client.rendering.world.WireRenderer;
1213
import falseresync.vivatech.common.block.VivatechBlocks;
1314
import falseresync.vivatech.common.blockentity.VivatechBlockEntities;
14-
import falseresync.vivatech.common.data.VivatechComponents;
1515
import falseresync.vivatech.common.entity.VivatechEntities;
1616
import falseresync.vivatech.common.item.VivatechItems;
17-
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
17+
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
1818
import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
19-
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
20-
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
21-
import net.minecraft.client.renderer.RenderType;
19+
import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderEvents;
2220
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
21+
import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
22+
import net.minecraft.client.renderer.entity.EntityRenderers;
2323
import net.minecraft.client.renderer.entity.NoopRenderer;
24-
import net.minecraft.client.renderer.item.ItemProperties;
24+
import net.minecraft.client.renderer.item.properties.numeric.RangeSelectItemModelProperties;
2525

2626
import static falseresync.vivatech.common.Vivatech.vtId;
2727

@@ -30,18 +30,18 @@ public static void init() {
3030
EntityModelLayerRegistry.registerModelLayer(WindTurbineBlockEntityRenderer.LAYER, WindTurbineBlockEntityRenderer::getTexturedModelData);
3131
EntityModelLayerRegistry.registerModelLayer(EnergyVeilFeatureRenderer.LAYER, EnergyVeilModel::getTexturedModelData);
3232

33-
EntityRendererRegistry.register(VivatechEntities.STAR_PROJECTILE, StarProjectileRenderer::new);
34-
EntityRendererRegistry.register(VivatechEntities.ENERGY_VEIL, NoopRenderer::new);
33+
EntityRenderers.register(VivatechEntities.STAR_PROJECTILE, StarProjectileRenderer::new);
34+
EntityRenderers.register(VivatechEntities.ENERGY_VEIL, NoopRenderer::new);
3535

3636
BlockEntityRenderers.register(VivatechBlockEntities.WIND_TURBINE, WindTurbineBlockEntityRenderer::new);
3737
BlockEntityRenderers.register(VivatechBlockEntities.CHARGER, ChargerBlockEntityRenderer::new);
3838

39-
BlockRenderLayerMap.INSTANCE.putBlocks(RenderType.cutout(),
39+
BlockRenderLayerMap.putBlocks(ChunkSectionLayer.CUTOUT,
4040
VivatechBlocks.WIRE_POST,
4141
VivatechBlocks.WIND_TURBINE
4242
);
4343

44-
ItemProperties.GENERIC_PROPERTIES.put(vtId("focus_plating"), (stack, world, entity, seed) -> stack.getOrDefault(VivatechComponents.FOCUS_PLATING, -1));
44+
RangeSelectItemModelProperties.ID_MAPPER.put(vtId("focus_plating"), FocusPlatingModelProperty.MAP_CODEC);
4545

4646
TrinketRendererRegistry.registerRenderer(VivatechItems.INSPECTOR_GOGGLES, new InspectorGogglesRenderer());
4747

‎src/main/java/falseresync/vivatech/client/rendering/item/FocusPlatingModelProperty.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package falseresync.vivatech.client.rendering.item;
2+
3+
import com.mojang.serialization.MapCodec;
4+
import falseresync.vivatech.common.data.VivatechComponents;
5+
import net.minecraft.client.multiplayer.ClientLevel;
6+
import net.minecraft.client.renderer.item.properties.numeric.RangeSelectItemModelProperty;
7+
import net.minecraft.world.entity.ItemOwner;
8+
import net.minecraft.world.item.ItemStack;
9+
import org.jspecify.annotations.Nullable;
10+
11+
public record FocusPlatingModelProperty() implements RangeSelectItemModelProperty {
12+
public static final MapCodec<FocusPlatingModelProperty> MAP_CODEC = MapCodec.unit(new FocusPlatingModelProperty());
13+
14+
@Override
15+
public float get(ItemStack itemStack, @Nullable ClientLevel clientLevel, @Nullable ItemOwner itemOwner, int i) {
16+
return itemStack.getOrDefault(VivatechComponents.FOCUS_PLATING, -1);
17+
}
18+
19+
@Override
20+
public MapCodec<FocusPlatingModelProperty> type() {
21+
return MAP_CODEC;
22+
}
23+
}

‎src/main/java/falseresync/vivatech/client/rendering/world/CometWarpBeaconRenderer.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import falseresync.vivatech.common.data.VivatechAttachments;
77
import falseresync.vivatech.common.data.VivatechComponents;
88
import falseresync.vivatech.common.item.VivatechItemTags;
9-
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
10-
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
9+
import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderContext;
10+
import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderEvents;
1111
import net.minecraft.client.Minecraft;
1212
import net.minecraft.client.renderer.LevelRenderer;
13-
import net.minecraft.client.renderer.RenderType;
13+
import net.minecraft.client.renderer.rendertype.RenderType;
14+
import net.minecraft.client.renderer.rendertype.RenderTypes;
1415
import net.minecraft.client.renderer.texture.OverlayTexture;
1516
import net.minecraft.client.renderer.texture.TextureAtlas;
1617
import net.minecraft.client.resources.model.Material;
@@ -25,7 +26,7 @@
2526
import com.mojang.math.Axis;
2627

2728
public class CometWarpBeaconRenderer implements WorldRenderEvents.AfterEntities {
28-
private static final RenderType BASE_LAYER = RenderType.entityTranslucentEmissive(vtId("textures/world/comet_warp_beacon.png"));
29+
private static final RenderType BASE_LAYER = RenderTypes.entityTranslucentEmissive(vtId("textures/world/comet_warp_beacon.png"));
2930
private static final Material CROWN_TEX = new Material(TextureAtlas.LOCATION_BLOCKS, vtId("world/comet_warp_beacon_crown"));
3031
private static final int TINT_BASE = Color.ofHsv(0f, 0f, 1, 0.5f).argb();
3132
private static final int TINT_CROWN = Color.WHITE.argb();
@@ -72,7 +73,7 @@ private static void drawCrown(WorldRenderContext context, PoseStack matrices, in
7273

7374
var perPanelAdjustment = new Matrix4f().rotateAround(Axis.YP.rotationDegrees(60), 0.5f, 0, 0.5f);
7475
var sprite = CROWN_TEX.sprite();
75-
var buffer = CROWN_TEX.buffer(context.consumers(), RenderType::entityTranslucentEmissive);
76+
var buffer = CROWN_TEX.buffer(context.consumers(), RenderTypes::entityTranslucentEmissive);
7677
for (int i = 0; i < 6; i++) {
7778
matrices.mulPose(perPanelAdjustment);
7879
RenderingUtil.drawSprite(matrices, buffer, sprite, TINT_BASE, light, overlay, 0, 1, 0, 1, -0.365f);
@@ -105,7 +106,7 @@ public void afterEntities(WorldRenderContext context) {
105106
return;
106107
}
107108

108-
var matrices = context.matrixStack();
109+
var matrices = context.matrices();
109110
var light = LevelRenderer.getLightColor(context.world(), anchor.pos().above());
110111
var overlay = OverlayTexture.NO_OVERLAY;
111112

‎src/main/java/falseresync/vivatech/client/rendering/world/WireRenderer.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
import falseresync.vivatech.client.wire.WireParameters;
77
import falseresync.vivatech.client.wire.WireRenderingRegistry;
88
import falseresync.vivatech.client.wire.WireModel;
9-
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
10-
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
9+
import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderContext;
10+
import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderEvents;
11+
import net.minecraft.client.Minecraft;
1112
import net.minecraft.client.renderer.LevelRenderer;
12-
import net.minecraft.client.renderer.RenderType;
13+
import net.minecraft.client.renderer.rendertype.RenderTypes;
1314
import net.minecraft.client.renderer.texture.OverlayTexture;
1415
import net.minecraft.core.BlockPos;
1516
import net.minecraft.core.Direction;
@@ -25,21 +26,26 @@ public class WireRenderer implements WorldRenderEvents.AfterEntities {
2526

2627
@Override
2728
public void afterEntities(WorldRenderContext context) {
28-
var wires = VivatechClient.getClientWireManager().getWires(context.world().dimension());
29+
var world = Minecraft.getInstance().level;
30+
if (world == null) {
31+
return;
32+
}
33+
34+
var wires = VivatechClient.getClientWireManager().getWires(world.dimension());
2935
if (wires.isEmpty()) {
3036
return;
3137
}
3238

33-
var matrices = context.matrixStack();
34-
var cameraPos = context.camera().getPosition();
39+
var matrices = context.matrices();
40+
var cameraPos = context.gameRenderer().getMainCamera().position();
3541

3642
for (var wire : wires) {
3743
var parameters = WireRenderingRegistry.getAndBuild(wire);
3844
var model = parameters.getModel();
39-
var buffer = model.getSprite().wrap(context.consumers().getBuffer(RenderType.cutout()));
45+
var buffer = model.getSprite().wrap(context.consumers().getBuffer(RenderTypes.cutoutMovingBlock()));
4046

4147
var wireEnd = wire.end().sub(wire.start(), new Vector3f());
42-
var light = LevelRenderer.getLightColor(context.world(), BlockPos.containing(wire.middle().x, wire.middle().y, wire.middle().z));
48+
var light = LevelRenderer.getLightColor(world, BlockPos.containing(wire.middle().x, wire.middle().y, wire.middle().z));
4349

4450
matrices.pushPose();
4551

‎src/main/java/falseresync/vivatech/common/entity/EnergyVeilEntity.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import falseresync.vivatech.common.data.VivatechAttachments;
66
import falseresync.vivatech.common.data.VivatechComponents;
77
import falseresync.vivatech.common.item.VivatechItemTags;
8-
import net.minecraft.Util;
98
import net.minecraft.core.UUIDUtil;
109
import net.minecraft.nbt.CompoundTag;
1110
import net.minecraft.nbt.NbtOps;
@@ -102,7 +101,7 @@ public void tick() {
102101
alignWithOwner();
103102
move(MoverType.SELF, getDeltaMovement());
104103

105-
if (!level().isClientSide) {
104+
if (!level().isClientSide()) {
106105
repelOutsiders();
107106

108107
if (tickCount >= lifeExpectancy) {

‎src/main/java/falseresync/vivatech/common/entity/StarProjectileEntity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import net.minecraft.server.level.ServerLevel;
99
import net.minecraft.world.entity.EntityType;
1010
import net.minecraft.world.entity.LivingEntity;
11-
import net.minecraft.world.entity.projectile.AbstractHurtingProjectile;
11+
import net.minecraft.world.entity.projectile.hurtingprojectile.AbstractHurtingProjectile;
1212
import net.minecraft.world.item.enchantment.EnchantmentHelper;
1313
import net.minecraft.world.level.Level;
1414
import net.minecraft.world.phys.EntityHitResult;

‎src/main/java/falseresync/vivatech/common/entity/VivatechEntities.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
package falseresync.vivatech.common.entity;
22

33
import falseresync.lib.registry.RegistryObject;
4-
import falseresync.vivatech.common.entity.EnergyVeilEntity;
5-
import falseresync.vivatech.common.entity.StarProjectileEntity;
64
import net.minecraft.world.entity.EntityType;
75
import net.minecraft.world.entity.MobCategory;
86

97
public class VivatechEntities {
10-
public static final @RegistryObject EntityType<falseresync.vivatech.common.entity.StarProjectileEntity> STAR_PROJECTILE = EntityType.Builder
11-
.<falseresync.vivatech.common.entity.StarProjectileEntity>of(StarProjectileEntity::new, MobCategory.MISC)
8+
public static final @RegistryObject EntityType<StarProjectileEntity> STAR_PROJECTILE = EntityType.Builder
9+
.<StarProjectileEntity>of(StarProjectileEntity::new, MobCategory.MISC)
1210
.sized(0.5F, 0.5F)
1311
.fireImmune()
1412
.noSave()
1513
.clientTrackingRange(16)
1614
.build();
17-
public static final @RegistryObject EntityType<falseresync.vivatech.common.entity.EnergyVeilEntity> ENERGY_VEIL = EntityType.Builder
15+
public static final @RegistryObject EntityType<EnergyVeilEntity> ENERGY_VEIL = EntityType.Builder
1816
.<falseresync.vivatech.common.entity.EnergyVeilEntity>of(EnergyVeilEntity::new, MobCategory.MISC)
1917
.sized(0F, 0F)
2018
.fireImmune()

‎src/main/java/falseresync/vivatech/common/item/VivatechItems.java‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
package falseresync.vivatech.common.item;
22

33
import falseresync.vivatech.common.block.VivatechBlocks;
4-
import falseresync.vivatech.common.item.FocusesPouchItem;
5-
import falseresync.vivatech.common.item.GadgetItem;
6-
import falseresync.vivatech.common.item.InspectorGogglesItem;
7-
import falseresync.vivatech.common.item.MortarAndPestleItem;
8-
import falseresync.vivatech.common.item.PliersItem;
9-
import falseresync.vivatech.common.item.ProbeItem;
10-
import falseresync.vivatech.common.item.WireItem;
11-
import falseresync.vivatech.common.item.focus.CometWarpFocusItem;
12-
import falseresync.vivatech.common.item.focus.EnergyVeilFocusItem;
13-
import falseresync.vivatech.common.item.focus.LightningFocusItem;
14-
import falseresync.vivatech.common.item.focus.StarshooterFocusItem;
154
import java.util.function.Function;
165
import net.minecraft.core.Registry;
176
import net.minecraft.core.registries.BuiltInRegistries;
@@ -35,15 +24,15 @@ public class VivatechItems {
3524

3625
public static final BlockItem WIRE_POST = rBlockItem("wire_post", VivatechBlocks.WIRE_POST, new Item.Properties());
3726

38-
public static final falseresync.vivatech.common.item.WireItem WIRE = r("wire", WireItem::new, new Item.Properties());
39-
public static final falseresync.vivatech.common.item.MortarAndPestleItem MORTAR_AND_PESTLE = r("mortar_and_pestle", MortarAndPestleItem::new, new Item.Properties().stacksTo(1).durability(16));
27+
public static final WireItem WIRE = r("wire", WireItem::new, new Item.Properties());
28+
public static final MortarAndPestleItem MORTAR_AND_PESTLE = r("mortar_and_pestle", MortarAndPestleItem::new, new Item.Properties().stacksTo(1).durability(16));
4029
public static final Item SCREWDRIVER = r("screwdriver", Item::new, new Item.Properties().stacksTo(1));
41-
public static final falseresync.vivatech.common.item.PliersItem PLIERS = r("pliers", PliersItem::new, new Item.Properties().stacksTo(1));
42-
public static final falseresync.vivatech.common.item.ProbeItem PROBE = r("probe", ProbeItem::new, new Item.Properties().stacksTo(1));
43-
public static final falseresync.vivatech.common.item.InspectorGogglesItem INSPECTOR_GOGGLES = r("inspector_goggles", InspectorGogglesItem::new, new Item.Properties().stacksTo(1));
44-
public static final falseresync.vivatech.common.item.FocusesPouchItem FOCUSES_POUCH = r("focuses_pouch", FocusesPouchItem::new, new Item.Properties().stacksTo(1));
30+
public static final PliersItem PLIERS = r("pliers", PliersItem::new, new Item.Properties().stacksTo(1));
31+
public static final ProbeItem PROBE = r("probe", ProbeItem::new, new Item.Properties().stacksTo(1));
32+
public static final InspectorGogglesItem INSPECTOR_GOGGLES = r("inspector_goggles", InspectorGogglesItem::new, new Item.Properties().stacksTo(1));
33+
public static final FocusesPouchItem FOCUSES_POUCH = r("focuses_pouch", FocusesPouchItem::new, new Item.Properties().stacksTo(1));
4534

46-
public static final falseresync.vivatech.common.item.GadgetItem GADGET = r("gadget", GadgetItem::new, new Item.Properties().stacksTo(1));
35+
public static final GadgetItem GADGET = r("gadget", GadgetItem::new, new Item.Properties().stacksTo(1));
4736

4837
public static final Item.Properties FOCUS_SETTINGS = new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON);
4938
public static final StarshooterFocusItem STARSHOOTER_FOCUS = r("starshooter_focus", StarshooterFocusItem::new, FOCUS_SETTINGS.durability(512));

0 commit comments

Comments
 (0)