Skip to content

Commit 3495d86

Browse files
falseresyncfalseresync
committed
Update to 1.21.11 (Pt 1)
1 parent 2d11cf5 commit 3495d86

19 files changed

Lines changed: 120 additions & 110 deletions

‎build.gradle‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22
import net.fabricmc.loom.task.RemapJarTask
33

44
plugins {
5-
id 'fabric-loom' version '1.14-SNAPSHOT'
5+
id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
66
id 'com.gradleup.shadow' version '9.0.0-beta10'
77
}
88

@@ -35,11 +35,16 @@ repositories {
3535
maven {
3636
url = "https://jitpack.io"
3737
}
38-
39-
maven {
40-
name = "Fuzs Mod Resources"
41-
url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
42-
}
38+
maven {
39+
// location of the maven that hosts JEI files since January 2023
40+
name = "Jared's maven"
41+
url = "https://maven.blamejared.com/"
42+
}
43+
maven {
44+
// location of a maven mirror for JEI files, as a fallback
45+
name = "ModMaven"
46+
url = "https://modmaven.dev"
47+
}
4348
}
4449

4550
fabricApi {
@@ -51,16 +56,16 @@ loom {
5156
}
5257

5358
dependencies {
54-
minecraft "com.mojang:minecraft:${project.minecraft_version}"
59+
minecraft "com.mojang:minecraft:$minecraft_version"
5560
mappings loom.officialMojangMappings()
56-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
57-
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
61+
modImplementation "net.fabricmc:fabric-loader:$loader_version"
62+
modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_version"
5863

5964
// ------------------------
6065
// --- MOD DEPENDENCIES ---
6166
// ------------------------
62-
modApi 'me.shedaniel.cloth:cloth-config-fabric:15.0.140'
63-
modApi "dev.emi:trinkets:3.10.0"
67+
modApi "me.shedaniel.cloth:cloth-config-fabric:$cloth_config_version"
68+
modApi "dev.emi:trinkets:$trinkets_version"
6469

6570
// --------------------------
6671
// --- OTHER DEPENDENCIES ---
@@ -75,8 +80,10 @@ dependencies {
7580
modLocalRuntime "mcp.mobius.waila:wthit:fabric-$wthit_version"
7681
modLocalRuntime "lol.bai:badpackets:fabric-$badpackets_version"
7782

78-
modCompileOnly "dev.emi:emi-fabric:$emi_version:api"
79-
modLocalRuntime "dev.emi:emi-fabric:$emi_version"
83+
// modCompileOnly "dev.emi:emi-fabric:$emi_version:api"
84+
// modLocalRuntime "dev.emi:emi-fabric:$emi_version"
85+
modCompileOnly("mezz.jei:jei-$minecraft_version-fabric-api:$jei_version")
86+
modRuntimeOnly("mezz.jei:jei-$minecraft_version-fabric:$jei_version")
8087

8188
modCompileOnly "com.terraformersmc:modmenu:$modmenu_version"
8289
modLocalRuntime "com.terraformersmc:modmenu:$modmenu_version"
@@ -85,11 +92,10 @@ dependencies {
8592
// --- CONVENIENCE ---
8693
// -------------------
8794
// Comment out / uncomment for testing and convenience
88-
modLocalRuntime "maven.modrinth:betterf3:11.0.3"
89-
modLocalRuntime "maven.modrinth:component-viewer:1.2.0+1.21.1"
90-
modLocalRuntime "com.github.provismet:lilylib:1.3.1-mc1.21" // required by tooltip-scroll
91-
modLocalRuntime "maven.modrinth:tooltip-scroll:1.4.0+1.21"
92-
modLocalRuntime "maven.modrinth:dev-tools-unlocker:1.0.0"
95+
// modLocalRuntime "maven.modrinth:betterf3:11.0.3"
96+
modLocalRuntime "maven.modrinth:component-viewer:1.3.2+1.21.11-fabric"
97+
modLocalRuntime "maven.modrinth:tooltip-scroll:1.5.1+1.21.10"
98+
// modLocalRuntime "maven.modrinth:dev-tools-unlocker:1.0.0"
9399
}
94100

95101
processResources {

‎gradle.properties‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,21 @@
22
org.gradle.jvmargs=-Xmx4G
33
org.gradle.parallel=true
44

5-
minecraft_version=1.21.1
6-
yarn_mappings=1.21.1+build.3
5+
minecraft_version=1.21.11
6+
yarn_mappings=1.21.11+build.3
77
loader_version=0.18.4
8-
fabric_version=0.116.7+1.21.1
8+
loom_version=1.14-SNAPSHOT
9+
fabric_version=0.140.2+1.21.11
910

1011
mod_version=1.0.0-alpha.27
1112
maven_group=falseresync.vivatech
1213
archives_base_name=vivatech
1314

14-
wthit_version=12.4.5
15-
badpackets_version=0.8.1
16-
emi_version=1.1.10+1.21
17-
modmenu_version=11.0.3
15+
cloth_config_version=21.11.153
16+
trinkets_version=3.10.0
17+
18+
wthit_version=18.0.4
19+
badpackets_version=0.11.2
20+
#emi_version=1.1.10+1.21
21+
jei_version=27.3.0.14
22+
modmenu_version=17.0.0-beta.1

‎src/main/java/falseresync/lib/client/BetterDrawContext.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@
99
import net.minecraft.client.Minecraft;
1010
import net.minecraft.client.gui.GuiGraphics;
1111
import net.minecraft.client.renderer.GameRenderer;
12-
import net.minecraft.resources.ResourceLocation;
12+
import net.minecraft.resources.Identifier;
1313
import org.joml.Matrix4f;
1414

1515
public class BetterDrawContext extends GuiGraphics {
1616
public BetterDrawContext(Minecraft client, GuiGraphics context) {
1717
super(client, context.bufferSource());
1818
}
1919

20-
public void drawSquare(ResourceLocation texture, int x, int y, int size) {
20+
public void drawSquare(Identifier texture, int x, int y, int size) {
2121
drawSquare(texture, x, y, size, size);
2222
}
2323

24-
public void drawSquare(ResourceLocation texture, int x, int y, int size, int textureSize) {
24+
public void drawSquare(Identifier texture, int x, int y, int size, int textureSize) {
2525
drawRect(texture, x, y, size, size, textureSize, textureSize);
2626
}
2727

28-
public void drawRect(ResourceLocation texture, int x, int y, int width, int height) {
28+
public void drawRect(Identifier texture, int x, int y, int width, int height) {
2929
drawRect(texture, x, y, width, height, 16, 16);
3030
}
3131

32-
public void drawRect(ResourceLocation texture, int x, int y, int width, int height, int texWidth, int texHeight) {
32+
public void drawRect(Identifier texture, int x, int y, int width, int height, int texWidth, int texHeight) {
3333
blit(texture, x, y, 0, 0, width, height, texWidth, texHeight);
3434
}
3535

36-
public void drawTexturedQuad(ResourceLocation texture, float x1, float x2, float y1, float y2, float u1, float u2, float v1, float v2) {
36+
public void drawTexturedQuad(Identifier texture, float x1, float x2, float y1, float y2, float u1, float u2, float v1, float v2) {
3737
float z = 0;
3838
RenderSystem.setShaderTexture(0, texture);
3939
RenderSystem.setShader(GameRenderer::getPositionTexShader);
@@ -46,15 +46,15 @@ public void drawTexturedQuad(ResourceLocation texture, float x1, float x2, float
4646
BufferUploader.drawWithShader(bufferBuilder.buildOrThrow());
4747
}
4848

49-
public void drawNonDiscreteRect(ResourceLocation texture, float x, float y, int u, int v, int regionW, int regionH, int texW, int texH) {
49+
public void drawNonDiscreteRect(Identifier texture, float x, float y, int u, int v, int regionW, int regionH, int texW, int texH) {
5050
drawTexturedQuad(texture,
5151
x, x + regionW,
5252
y, y + regionH,
5353
(float) u / texW, (float) (u + regionW) / texW,
5454
(float) v / texH, (float) (v + regionH) / texH);
5555
}
5656

57-
public void drawNonDiscreteRect(ResourceLocation texture, float x, float y, int texW, int texH) {
57+
public void drawNonDiscreteRect(Identifier texture, float x, float y, int texW, int texH) {
5858
drawNonDiscreteRect(texture, x, y, 0, 0, texW, texH, texW, texH);
5959
}
6060
}

‎src/main/java/falseresync/lib/registry/AutoRegistry.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.lang.reflect.InaccessibleObjectException;
66
import java.lang.reflect.Modifier;
77
import net.minecraft.core.Registry;
8-
import net.minecraft.resources.ResourceLocation;
8+
import net.minecraft.resources.Identifier;
99

1010
/**
1111
* <h2>USAGE EXAMPLE</h2>
@@ -60,7 +60,7 @@ public <T> AutoRegistry link(Registry<T> registry, Class<?>... holderClasses) {
6060
}
6161

6262
//noinspection unchecked
63-
Registry.register(registry, ResourceLocation.fromNamespaceAndPath(modId, field.getName().toLowerCase()), (T) registryObject);
63+
Registry.register(registry, Identifier.fromNamespaceAndPath(modId, field.getName().toLowerCase()), (T) registryObject);
6464
} catch (IllegalAccessException e) {
6565
throw new InaccessibleObjectException("[AutoRegistry / %s] Couldn't read a @RegistryObject field: %s at %s".formatted(modId, field.getName(), holderClass.getCanonicalName()));
6666
} catch (ClassCastException e) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
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.resources.ResourceLocation;
7+
import net.minecraft.resources.Identifier;
88
import net.minecraft.world.item.ItemStack;
99

1010
public class InventoryComponentTooltip implements ClientTooltipComponent {
11-
private static final ResourceLocation BACKGROUND_TEXTURE = ResourceLocation.withDefaultNamespace("container/bundle/background");
11+
private static final Identifier BACKGROUND_TEXTURE = Identifier.withDefaultNamespace("container/bundle/background");
1212
private static final int BOTTOM_MARGIN = 4;
1313
private static final int WIDTH_PER_COLUMN = 18;
1414
private static final int HEIGHT_PER_ROW = 20;
@@ -76,13 +76,13 @@ private int getRows() {
7676
}
7777

7878
enum SlotSprite {
79-
SLOT(ResourceLocation.withDefaultNamespace("container/bundle/slot"), 18, 20);
79+
SLOT(Identifier.withDefaultNamespace("container/bundle/slot"), 18, 20);
8080

81-
public final ResourceLocation texture;
81+
public final Identifier texture;
8282
public final int width;
8383
public final int height;
8484

85-
SlotSprite(final ResourceLocation texture, final int width, final int height) {
85+
SlotSprite(final Identifier texture, final int width, final int height) {
8686
this.texture = texture;
8787
this.width = width;
8888
this.height = height;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
import net.minecraft.client.DeltaTracker;
99
import net.minecraft.client.Minecraft;
1010
import net.minecraft.client.gui.Font;
11-
import net.minecraft.resources.ResourceLocation;
11+
import net.minecraft.resources.Identifier;
1212
import net.minecraft.world.item.ItemStack;
1313

1414
import static falseresync.vivatech.common.Vivatech.vtId;
1515

1616
public class ChargeDisplayHudItem implements HudItem {
17-
protected static final ResourceLocation TEX = vtId("textures/hud/charge_display.png");
17+
protected static final Identifier TEX = vtId("textures/hud/charge_display.png");
1818
private static final int WIDGET_W = 16;
1919
private static final int WIDGET_H = 64;
2020
private static final int TEX_W = 32;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
import net.minecraft.client.Minecraft;
1818
import net.minecraft.client.gui.Font;
1919
import net.minecraft.core.component.DataComponents;
20-
import net.minecraft.resources.ResourceLocation;
20+
import net.minecraft.resources.Identifier;
2121
import net.minecraft.world.item.ItemStack;
2222

2323
import static falseresync.vivatech.common.Vivatech.vtId;
2424

2525
public class FocusPickerHudItem implements HudItem {
26-
protected static final ResourceLocation SELECTION_TEX = vtId("textures/hud/focus_picker.png");
26+
protected static final Identifier SELECTION_TEX = vtId("textures/hud/focus_picker.png");
2727
private static final int MARGIN = 2;
2828
private static final int WIDGET_W = 22;
2929
private static final int WIDGET_H = 22;

‎src/main/java/falseresync/vivatech/client/rendering/entity/EnergyVeilFeatureRenderer.java‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,49 @@
44
import falseresync.vivatech.common.Vivatech;
55
import falseresync.vivatech.common.data.VivatechAttachments;
66
import falseresync.vivatech.common.entity.EnergyVeilEntity;
7+
import net.minecraft.client.model.player.PlayerModel;
8+
import net.minecraft.client.renderer.SubmitNodeCollector;
9+
import net.minecraft.client.renderer.entity.state.AvatarRenderState;
10+
import net.minecraft.client.renderer.rendertype.RenderType;
11+
import net.minecraft.world.entity.Avatar;
712
import org.jetbrains.annotations.Nullable;
813

914
import java.util.Optional;
1015
import net.minecraft.client.Minecraft;
11-
import net.minecraft.client.model.PlayerModel;
1216
import net.minecraft.client.model.geom.EntityModelSet;
1317
import net.minecraft.client.model.geom.ModelLayerLocation;
1418
import net.minecraft.client.player.AbstractClientPlayer;
1519
import net.minecraft.client.renderer.MultiBufferSource;
16-
import net.minecraft.client.renderer.RenderType;
1720
import net.minecraft.client.renderer.entity.RenderLayerParent;
1821
import net.minecraft.client.renderer.entity.layers.RenderLayer;
1922
import net.minecraft.client.renderer.texture.OverlayTexture;
2023
import net.minecraft.core.Direction;
21-
import net.minecraft.resources.ResourceLocation;
24+
import net.minecraft.resources.Identifier;
2225
import net.minecraft.world.entity.player.Player;
2326

2427
import static falseresync.vivatech.common.Vivatech.vtId;
2528

2629
import com.mojang.blaze3d.vertex.PoseStack;
2730
import com.mojang.math.Axis;
2831

29-
public class EnergyVeilFeatureRenderer<T extends Player> extends RenderLayer<T, PlayerModel<T>> {
30-
public static final ResourceLocation TEXTURE = vtId("textures/entity/energy_veil.png");
32+
public class EnergyVeilFeatureRenderer<T extends Avatar> extends RenderLayer<AvatarRenderState, PlayerModel> {
33+
public static final Identifier TEXTURE = vtId("textures/entity/energy_veil.png");
3134
public static final ModelLayerLocation LAYER = new ModelLayerLocation(vtId("energy_veil"), "main");
3235
private final falseresync.vivatech.client.rendering.entity.EnergyVeilModel model;
3336
private final RenderType renderLayer;
3437

35-
public EnergyVeilFeatureRenderer(RenderLayerParent<T, PlayerModel<T>> context, EntityModelSet loader) {
38+
public EnergyVeilFeatureRenderer(RenderLayerParent<T, PlayerModel> context, EntityModelSet loader) {
3639
super(context);
3740
model = new EnergyVeilModel(loader.bakeLayer(LAYER));
3841
renderLayer = RenderType.entityTranslucentEmissive(TEXTURE);
3942
}
4043

4144
@Override
4245
public void render(PoseStack matrices, MultiBufferSource vertexConsumers, int light, T entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) {
43-
var veil = findVeil(entity);
44-
if (veil == null) return;
4546

46-
matrices.pushPose();
47-
var buffer = vertexConsumers.getBuffer(renderLayer);
48-
model.prepareMobModel(veil, limbAngle, limbDistance, tickDelta);
49-
50-
for (int i = 0; i < 4; i++) {
51-
matrices.pushPose();
52-
matrices.mulPose(Axis.YP.rotationDegrees(i * 45));
53-
matrices.translate(-veil.getVisibleRadius(), -1, 0);
54-
model.renderToBuffer(matrices, buffer, light, OverlayTexture.NO_OVERLAY);
55-
matrices.translate(veil.getVisibleRadius() * 2, 0, 0);
56-
model.renderToBuffer(matrices, buffer, light, OverlayTexture.NO_OVERLAY);
57-
matrices.popPose();
58-
}
59-
matrices.popPose();
6047
}
6148

62-
public void renderInFirstPerson(PoseStack matrices, MultiBufferSource vertexConsumers, int light, T entity, float tickDelta, float animationProgress) {
49+
public void renderInFirstPerson(PoseStack matrices, MultiBufferSource vertexConsumers, int light, T entity, float tickDelta) {
6350
var veil = findVeil(entity);
6451
if (veil == null) return;
6552

@@ -92,6 +79,26 @@ private EnergyVeilEntity findVeil(T entity) {
9279
.flatMap(foundEntity -> foundEntity instanceof EnergyVeilEntity veil ? Optional.of(veil) : Optional.empty())
9380
.orElse(null);
9481
}
82+
@Override
83+
public void submit(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int i, AvatarRenderState entityRenderState, float f, float g) {
84+
var veil = findVeil(entityRenderState);
85+
if (veil == null) return;
86+
87+
matrices.pushPose();
88+
var buffer = vertexConsumers.getBuffer(renderLayer);
89+
model.prepareMobModel(veil, limbAngle, limbDistance, tickDelta);
90+
91+
for (int i = 0; i < 4; i++) {
92+
matrices.pushPose();
93+
matrices.mulPose(Axis.YP.rotationDegrees(i * 45));
94+
matrices.translate(-veil.getVisibleRadius(), -1, 0);
95+
model.renderToBuffer(matrices, buffer, light, OverlayTexture.NO_OVERLAY);
96+
matrices.translate(veil.getVisibleRadius() * 2, 0, 0);
97+
model.renderToBuffer(matrices, buffer, light, OverlayTexture.NO_OVERLAY);
98+
matrices.popPose();
99+
}
100+
matrices.popPose();
101+
}
95102

96103
public interface Accessor {
97104
EnergyVeilFeatureRenderer<AbstractClientPlayer> vivatech$getEnergyVeilRenderer();

‎src/main/java/falseresync/vivatech/client/rendering/entity/StarProjectileRenderer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.minecraft.client.renderer.entity.EntityRenderer;
88
import net.minecraft.client.renderer.entity.EntityRendererProvider;
99
import net.minecraft.client.renderer.texture.OverlayTexture;
10-
import net.minecraft.resources.ResourceLocation;
10+
import net.minecraft.resources.Identifier;
1111
import org.joml.Matrix4f;
1212

1313
import static falseresync.vivatech.common.Vivatech.vtId;
@@ -16,7 +16,7 @@
1616
import com.mojang.blaze3d.vertex.VertexConsumer;
1717

1818
public class StarProjectileRenderer extends EntityRenderer<StarProjectileEntity> {
19-
protected static final ResourceLocation TEXTURE = vtId("textures/entity/star_projectile.png");
19+
protected static final Identifier TEXTURE = vtId("textures/entity/star_projectile.png");
2020
private final RenderType renderLayer;
2121

2222
public StarProjectileRenderer(EntityRendererProvider.Context context) {
@@ -64,7 +64,7 @@ public void render(StarProjectileEntity entity, float yaw, float tickDelta, Pose
6464
}
6565

6666
@Override
67-
public ResourceLocation getTextureLocation(StarProjectileEntity entity) {
67+
public Identifier getTextureLocation(StarProjectileEntity entity) {
6868
return TEXTURE;
6969
}
7070
}

‎src/main/java/falseresync/vivatech/common/Vivatech.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import net.fabricmc.api.ModInitializer;
2222
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
2323
import net.minecraft.core.registries.BuiltInRegistries;
24-
import net.minecraft.resources.ResourceLocation;
24+
import net.minecraft.resources.Identifier;
2525
import org.slf4j.LoggerFactory;
2626

2727
public class Vivatech implements ModInitializer {
@@ -43,8 +43,8 @@ public static VivatechConfig getConfig() {
4343
return config;
4444
}
4545

46-
public static ResourceLocation vtId(String path) {
47-
return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
46+
public static Identifier vtId(String path) {
47+
return Identifier.fromNamespaceAndPath(MOD_ID, path);
4848
}
4949

5050
@Override

0 commit comments

Comments
 (0)