mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-10-23 18:07:39 +00:00
Update to Minecraft 1.19.3
Lots of minor changes, but nothing too nasty - just tedious. Known bugs/issues: - REI and JEI haven't been updated at the time of writing, so our usage of their APIs may be incompatible. - Crash when opening the config UI in Fabric, as forgeconfigapi-port hasn't been updated yet. Will hold off on doing a release until those mods have updated.
This commit is contained in:
Jonathan Coates
@@ -38,7 +38,7 @@ public final class ForgeClientRegistry {
|
||||
|
||||
@SubscribeEvent
|
||||
public static void registerShaders(RegisterShadersEvent event) throws IOException {
|
||||
ClientRegistry.registerShaders(event.getResourceManager(), event::registerShader);
|
||||
ClientRegistry.registerShaders(event.getResourceProvider(), event::registerShader);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
|
||||
@@ -7,20 +7,19 @@ package dan200.computercraft.client.model.turtle;
|
||||
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import dan200.computercraft.api.ComputerCraftAPI;
|
||||
import net.minecraft.client.renderer.block.model.ItemOverrides;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.resources.model.*;
|
||||
import net.minecraft.client.resources.model.BakedModel;
|
||||
import net.minecraft.client.resources.model.Material;
|
||||
import net.minecraft.client.resources.model.ModelBaker;
|
||||
import net.minecraft.client.resources.model.ModelState;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.util.GsonHelper;
|
||||
import net.minecraftforge.client.model.geometry.IGeometryBakingContext;
|
||||
import net.minecraftforge.client.model.geometry.IGeometryLoader;
|
||||
import net.minecraftforge.client.model.geometry.IUnbakedGeometry;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.function.Function;
|
||||
|
||||
public final class TurtleModelLoader implements IGeometryLoader<TurtleModelLoader.Unbaked> {
|
||||
@@ -45,15 +44,7 @@ public final class TurtleModelLoader implements IGeometryLoader<TurtleModelLoade
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
|
||||
Set<Material> materials = new HashSet<>();
|
||||
materials.addAll(modelGetter.apply(family).getMaterials(modelGetter, missingTextureErrors));
|
||||
materials.addAll(modelGetter.apply(COLOUR_TURTLE_MODEL).getMaterials(modelGetter, missingTextureErrors));
|
||||
return materials;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BakedModel bake(IGeometryBakingContext owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState transform, ItemOverrides overrides, ResourceLocation modelLocation) {
|
||||
public BakedModel bake(IGeometryBakingContext owner, ModelBaker bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState transform, ItemOverrides overrides, ResourceLocation modelLocation) {
|
||||
var mainModel = bakery.bake(family, transform, spriteGetter);
|
||||
if (mainModel == null) throw new NullPointerException(family + " failed to bake");
|
||||
|
||||
|
||||
@@ -166,6 +166,7 @@
|
||||
"gui.computercraft.config.upload_nag_delay": "Upload nag delay",
|
||||
"gui.computercraft.config.upload_nag_delay.tooltip": "The delay in seconds after which we'll notify about unhandled imports. Set to 0 to disable.\nRange: 0 ~ 60",
|
||||
"gui.computercraft.pocket_computer_overlay": "Pocket computer open. Press ESC to close.",
|
||||
"gui.computercraft.terminal": "Computer terminal",
|
||||
"gui.computercraft.tooltip.computer_id": "Computer ID: %s",
|
||||
"gui.computercraft.tooltip.copy": "Copy to clipboard",
|
||||
"gui.computercraft.tooltip.disk_id": "Disk ID: %s",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "redstone",
|
||||
"key": {"#": {"tag": "forge:stone"}, "R": {"tag": "forge:dusts/redstone"}},
|
||||
"pattern": [" # ", "#R#", " # "],
|
||||
"result": {"count": 6, "item": "computercraft:cable"}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"type": "computercraft:colour"}
|
||||
{"type": "computercraft:colour", "category": "misc"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "redstone",
|
||||
"key": {
|
||||
"#": {"tag": "forge:ingots/gold"},
|
||||
"G": {"tag": "forge:glass_panes"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:computer_upgrade",
|
||||
"category": "redstone",
|
||||
"family": "ADVANCED",
|
||||
"key": {"#": {"tag": "forge:ingots/gold"}, "C": {"item": "computercraft:computer_normal"}},
|
||||
"pattern": ["###", "#C#", "# #"],
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "redstone",
|
||||
"key": {
|
||||
"#": {"tag": "forge:ingots/gold"},
|
||||
"G": {"tag": "forge:glass_panes"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "redstone",
|
||||
"key": {"#": {"tag": "forge:stone"}, "G": {"tag": "forge:glass_panes"}, "R": {"tag": "forge:dusts/redstone"}},
|
||||
"pattern": ["###", "#R#", "#G#"],
|
||||
"result": {"item": "computercraft:computer_normal"}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"type": "computercraft:disk"}
|
||||
{"type": "computercraft:disk", "category": "misc"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:black_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:1118481}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:pink_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:15905484}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:lime_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:8375321}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [
|
||||
{"tag": "forge:dusts/redstone"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [
|
||||
{"tag": "forge:dusts/redstone"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [
|
||||
{"tag": "forge:dusts/redstone"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [
|
||||
{"tag": "forge:dusts/redstone"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:white_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:15790320}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:red_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:13388876}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:green_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:5744206}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:brown_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:8349260}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:blue_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:3368652}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [
|
||||
{"tag": "forge:dusts/redstone"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:cyan_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:5020082}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [
|
||||
{"tag": "forge:dusts/redstone"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shapeless",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:disk",
|
||||
"ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:gray_dye"}],
|
||||
"result": {"item": "computercraft:disk", "nbt": "{Color:5000268}"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "redstone",
|
||||
"key": {"#": {"tag": "forge:stone"}, "R": {"tag": "forge:dusts/redstone"}},
|
||||
"pattern": ["###", "#R#", "#R#"],
|
||||
"result": {"item": "computercraft:disk_drive"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "redstone",
|
||||
"key": {"#": {"tag": "forge:ingots/gold"}, "G": {"tag": "forge:glass_panes"}},
|
||||
"pattern": ["###", "#G#", "###"],
|
||||
"result": {"count": 4, "item": "computercraft:monitor_advanced"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "redstone",
|
||||
"key": {"#": {"tag": "forge:stone"}, "G": {"tag": "forge:glass_panes"}},
|
||||
"pattern": ["###", "#G#", "###"],
|
||||
"result": {"item": "computercraft:monitor_normal"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shaped",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:pocket_advanced",
|
||||
"key": {"#": {"item": "computercraft:speaker"}, "P": {"item": "computercraft:pocket_computer_advanced"}},
|
||||
"pattern": ["#", "P"],
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shaped",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:pocket_advanced",
|
||||
"key": {
|
||||
"#": {"item": "computercraft:wireless_modem_advanced"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shaped",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:pocket_advanced",
|
||||
"key": {
|
||||
"#": {"item": "computercraft:wireless_modem_normal"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "redstone",
|
||||
"key": {
|
||||
"#": {"tag": "forge:ingots/gold"},
|
||||
"A": {"item": "minecraft:golden_apple"},
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:computer_upgrade",
|
||||
"category": "redstone",
|
||||
"family": "ADVANCED",
|
||||
"key": {"#": {"tag": "forge:ingots/gold"}, "C": {"item": "computercraft:pocket_computer_normal"}},
|
||||
"pattern": ["###", "#C#", "# #"],
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "redstone",
|
||||
"key": {
|
||||
"#": {"tag": "forge:stone"},
|
||||
"A": {"item": "minecraft:golden_apple"},
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"type": "computercraft:pocket_computer_upgrade"}
|
||||
{"type": "computercraft:pocket_computer_upgrade", "category": "misc"}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "computercraft:impostor_shaped",
|
||||
"category": "redstone",
|
||||
"group": "computercraft:pocket_normal",
|
||||
"key": {"#": {"item": "computercraft:speaker"}, "P": {"item": "computercraft:pocket_computer_normal"}},
|
||||
"pattern": ["#", "P"],
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user