Skip to content
This repository was archived by the owner on Jul 10, 2024. It is now read-only.

Commit a858fa6

Browse files
delta2forcedelta2force
authored
Merge pull request #126 from Delta2Force/1.16.3
Update to Fabric 1.16.3
2 parents 1a60c2b + 748fa32 commit a858fa6

40 files changed

Lines changed: 280 additions & 253 deletions

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/use
6-
minecraft_version=1.15.2
7-
yarn_mappings=1.15.2+build.15
8-
loader_version=0.8.2+build.194
6+
minecraft_version=1.16.3
7+
yarn_mappings=1.16.3+build.17
8+
loader_version=0.10.0+build.208
99

1010
# Mod Properties
11-
mod_version = 1.4.12
11+
mod_version = 1.4.13
1212
maven_group = deltatwoforce
1313
archives_base_name = mcvmcomputers
1414

1515
# Dependencies
1616
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
17-
fabric_version=0.5.1+build.294-1.15
17+
fabric_version=0.22.0+build.408-1.16

‎src/main/java/mcvmcomputers/MainMod.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
import net.minecraft.item.Item;
3131
import net.minecraft.item.ItemStack;
3232
import net.minecraft.nbt.CompoundTag;
33+
import net.minecraft.network.PacketByteBuf;
3334
import net.minecraft.text.TranslatableText;
34-
import net.minecraft.util.DefaultedList;
3535
import net.minecraft.util.Formatting;
36-
import net.minecraft.util.PacketByteBuf;
36+
import net.minecraft.util.collection.DefaultedList;
3737

3838
import static mcvmcomputers.networking.PacketList.*;
3939

@@ -165,7 +165,7 @@ public static void registerServerPackets() {
165165
}
166166
}
167167
}else {
168-
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.motherboard_not_present").formatted(Formatting.RED));
168+
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.motherboard_not_present").formatted(Formatting.RED), false);
169169
}
170170
});
171171
});
@@ -189,7 +189,7 @@ public static void registerServerPackets() {
189189
}
190190
}
191191
}else {
192-
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.gpu_not_present").formatted(Formatting.RED));
192+
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.gpu_not_present").formatted(Formatting.RED), false);
193193
}
194194
});
195195
});
@@ -215,7 +215,7 @@ public static void registerServerPackets() {
215215
}
216216
}
217217
}else {
218-
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.cpu_not_present").formatted(Formatting.RED));
218+
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.cpu_not_present").formatted(Formatting.RED), false);
219219
}
220220
});
221221
});
@@ -244,7 +244,7 @@ public static void registerServerPackets() {
244244
}
245245
}
246246
}else {
247-
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.cpu_not_present").formatted(Formatting.RED));
247+
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.cpu_not_present").formatted(Formatting.RED), false);
248248
}
249249
});
250250
});
@@ -269,7 +269,7 @@ public static void registerServerPackets() {
269269
}
270270
}
271271
}else {
272-
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.cpu_not_present").formatted(Formatting.RED));
272+
packetContext.getPlayer().sendMessage(new TranslatableText("mcvmcomputers.cpu_not_present").formatted(Formatting.RED), false);
273273
}
274274
});
275275
});

‎src/main/java/mcvmcomputers/client/ClientMod.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
import net.minecraft.client.MinecraftClient;
5151
import net.minecraft.client.texture.NativeImage;
5252
import net.minecraft.client.texture.NativeImageBackedTexture;
53+
import net.minecraft.network.PacketByteBuf;
5354
import net.minecraft.text.TranslatableText;
5455
import net.minecraft.util.Formatting;
5556
import net.minecraft.util.Identifier;
56-
import net.minecraft.util.PacketByteBuf;
5757

5858
public class ClientMod implements ClientModInitializer{
5959
public static final OutputStream discardAllBytes = new OutputStream() { @Override public void write(int b) throws IOException {} };
@@ -197,12 +197,12 @@ public static void generatePCScreen() {
197197

198198
if(sz > 32766) {
199199
if(!failedSend){
200-
mcc.player.sendMessage(new TranslatableText("mcvmcomputers.screen_too_big_mp").formatted(Formatting.RED));
200+
mcc.player.sendMessage(new TranslatableText("mcvmcomputers.screen_too_big_mp").formatted(Formatting.RED), false);
201201
failedSend = true;
202202
}
203203
}else {
204204
if(failedSend) {
205-
mcc.player.sendMessage(new TranslatableText("mcvmcomputers.screen_ok_mp").formatted(Formatting.GREEN));
205+
mcc.player.sendMessage(new TranslatableText("mcvmcomputers.screen_ok_mp").formatted(Formatting.GREEN), false);
206206
failedSend = false;
207207
}
208208

‎src/main/java/mcvmcomputers/client/entities/model/DeliveryChestModel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ private void generateTexture() {
132132
ni.copyFrom(baseTexture);
133133
for(int x = 38;x<50;x++) {
134134
for(int y = 34;y<40;y++) {
135-
ni.setPixelRgba(x, y, randomColor());
135+
ni.setPixelColor(x, y, randomColor());
136136
}
137137
}
138138
for(int x = 32;x<56;x++) {
139139
for(int y = 40;y<43;y++) {
140-
ni.setPixelRgba(x, y, randomColor());
140+
ni.setPixelColor(x, y, randomColor());
141141
}
142142
}
143143
nibt = new NativeImageBackedTexture(ni);

‎src/main/java/mcvmcomputers/client/entities/render/CRTScreenRender.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import net.minecraft.client.render.entity.EntityRenderDispatcher;
1919
import net.minecraft.client.render.entity.EntityRenderer;
2020
import net.minecraft.client.render.model.json.ModelTransformation.Mode;
21-
import net.minecraft.client.util.math.Matrix4f;
2221
import net.minecraft.client.util.math.MatrixStack;
2322
import net.minecraft.item.ItemStack;
2423
import net.minecraft.util.Identifier;
24+
import net.minecraft.util.math.Matrix4f;
2525
import net.minecraft.util.math.Quaternion;
2626

2727
public class CRTScreenRender extends EntityRenderer<EntityCRTScreen>{
@@ -51,7 +51,7 @@ public void render(EntityCRTScreen entity, float yaw, float tickDelta, MatrixSta
5151

5252
matrices.push();
5353
matrices.translate(0, 0.5, 0);
54-
Quaternion look = MVCUtils.lookAt(entity.getPosVector(), entity.getLookAtPos());
54+
Quaternion look = MVCUtils.lookAt(entity.getPos(), entity.getLookAtPos());
5555
matrices.multiply(look);
5656
MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(ItemList.ITEM_CRTSCREEN), Mode.NONE, light, OverlayTexture.DEFAULT_UV, matrices, vertexConsumers);
5757
if(ClientMod.vmScreenTextures.containsKey(UUID.fromString(entity.getOwnerUUID()))) {

‎src/main/java/mcvmcomputers/client/entities/render/DeliveryChestRender.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,13 +251,13 @@ public void render(EntityDeliveryChest entity, float yaw, float tickDelta, Matri
251251
matrices.translate(0, -5, 0);
252252
this.getFontRenderer().draw("Please insert", 6, 25, -1, false, matrices.peek().getModel(), vertexConsumers, false, new Color(0f,0f,0f,0f).getRGB(), light);
253253
String s = ""+ClientMod.myOrder.price;
254-
this.getFontRenderer().draw(s, (39) - this.getFontRenderer().getStringWidth(s)/2, 33, new Color(0.4f,0.4f,1f,1f).getRGB(), false, matrices.peek().getModel(), vertexConsumers, false, new Color(0f,0f,0f,0f).getRGB(), light);
254+
this.getFontRenderer().draw(s, (39) - this.getFontRenderer().getWidth(s)/2, 33, new Color(0.4f,0.4f,1f,1f).getRGB(), false, matrices.peek().getModel(), vertexConsumers, false, new Color(0f,0f,0f,0f).getRGB(), light);
255255
this.getFontRenderer().draw("Iron Ingots", 10, 41, -1, false, matrices.peek().getModel(), vertexConsumers, false, new Color(0f,0f,0f,0f).getRGB(), light);
256256
this.getFontRenderer().draw("by clicking", 13, 50, -1, false, matrices.peek().getModel(), vertexConsumers, false, new Color(0f,0f,0f,0f).getRGB(), light);
257257
this.getFontRenderer().draw("this chest", 14, 59, -1, false, matrices.peek().getModel(), vertexConsumers, false, new Color(0f,0f,0f,0f).getRGB(), light);
258258
}else if(ClientMod.myOrder.currentStatus == OrderStatus.ORDER_CHEST_ARRIVED || ClientMod.myOrder.currentStatus == OrderStatus.ORDER_CHEST_RECEIVED) {
259259
String s = ClientMod.myOrder.items.size() + " items";
260-
this.getFontRenderer().draw(s, (39) - this.getFontRenderer().getStringWidth(s)/2, 20, -1, false, matrices.peek().getModel(), vertexConsumers, false, new Color(0f,0f,1f,0.2f).getRGB(), light);
260+
this.getFontRenderer().draw(s, (39) - this.getFontRenderer().getWidth(s)/2, 20, -1, false, matrices.peek().getModel(), vertexConsumers, false, new Color(0f,0f,1f,0.2f).getRGB(), light);
261261
matrices.push();
262262
matrices.translate(0.5, 0, 0);
263263
this.getFontRenderer().draw("in chest", 19, 30, -1, false, matrices.peek().getModel(), vertexConsumers, false, new Color(0f,0f,0f,0f).getRGB(), light);

‎src/main/java/mcvmcomputers/client/entities/render/FlatScreenRender.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import net.minecraft.client.render.entity.EntityRenderDispatcher;
1919
import net.minecraft.client.render.entity.EntityRenderer;
2020
import net.minecraft.client.render.model.json.ModelTransformation.Mode;
21-
import net.minecraft.client.util.math.Matrix4f;
2221
import net.minecraft.client.util.math.MatrixStack;
2322
import net.minecraft.item.ItemStack;
2423
import net.minecraft.util.Identifier;
24+
import net.minecraft.util.math.Matrix4f;
2525
import net.minecraft.util.math.Quaternion;
2626

2727
public class FlatScreenRender extends EntityRenderer<EntityFlatScreen>{
@@ -51,7 +51,7 @@ public void render(EntityFlatScreen entity, float yaw, float tickDelta, MatrixSt
5151

5252
matrices.push();
5353
matrices.translate(0, 0.5, 0);
54-
Quaternion look = MVCUtils.lookAt(entity.getPosVector(), entity.getLookAtPos());
54+
Quaternion look = MVCUtils.lookAt(entity.getPos(), entity.getLookAtPos());
5555
matrices.multiply(look);
5656
MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(ItemList.ITEM_FLATSCREEN), Mode.NONE, light, OverlayTexture.DEFAULT_UV, matrices, vertexConsumers);
5757
if(ClientMod.vmScreenTextures.containsKey(UUID.fromString(entity.getOwnerUUID()))) {

‎src/main/java/mcvmcomputers/client/entities/render/ItemPreviewRender.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public void render(EntityItemPreview entity, float yaw, float tickDelta, MatrixS
3131
matrices.push();
3232

3333
matrices.translate(0, 0.5, 0);
34-
Vec3d v = mcc.player.getPosVector();
35-
Quaternion look = MVCUtils.lookAt(entity.getPosVector(), new Vec3d(v.x, entity.getY(), v.z));
34+
Vec3d v = mcc.player.getPos();
35+
Quaternion look = MVCUtils.lookAt(entity.getPos(), new Vec3d(v.x, entity.getY(), v.z));
3636
matrices.multiply(look);
3737
matrices.push();
3838
if(entity.getPreviewedItemStack().getItem() instanceof PlacableOrderableItem) {

‎src/main/java/mcvmcomputers/client/entities/render/KeyboardRender.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void render(EntityKeyboard entity, float yaw, float tickDelta, MatrixStac
2929
VertexConsumerProvider vertexConsumers, int light) {
3030
matrices.push();
3131
matrices.translate(0, 0.5, 0);
32-
Quaternion look = MVCUtils.lookAt(entity.getPosVector(), entity.getLookAtPos());
32+
Quaternion look = MVCUtils.lookAt(entity.getPos(), entity.getLookAtPos());
3333
matrices.multiply(look);
3434
MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(ItemList.ITEM_KEYBOARD), Mode.NONE, light, OverlayTexture.DEFAULT_UV, matrices, vertexConsumers);
3535
matrices.pop();

‎src/main/java/mcvmcomputers/client/entities/render/MouseRender.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void render(EntityMouse entity, float yaw, float tickDelta, MatrixStack m
2929
VertexConsumerProvider vertexConsumers, int light) {
3030
matrices.push();
3131
matrices.translate(0, 0.5, 0);
32-
Quaternion look = MVCUtils.lookAt(entity.getPosVector(), entity.getLookAtPos());
32+
Quaternion look = MVCUtils.lookAt(entity.getPos(), entity.getLookAtPos());
3333
matrices.multiply(look);
3434
MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(ItemList.ITEM_MOUSE), Mode.NONE, light, OverlayTexture.DEFAULT_UV, matrices, vertexConsumers);
3535
matrices.pop();

0 commit comments

Comments
 (0)