From 7acef622352bffff3f26a4a059e26af7097b2701 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Thu, 30 Nov 2023 11:32:28 -0500 Subject: [PATCH] Fix Tater --- .../oddities/module/TinyPotatoModule.java | 16 ++++------ .../quark/mixin/client/ModelManagerMixin.java | 28 ++++++++++++++++++ .../resources/META-INF/accesstransformer.cfg | 3 +- .../quark/models/tiny_potato/acetater.json | 2 +- .../models/tiny_potato/agendertater.json | 2 +- .../quark/models/tiny_potato/angry.json | 2 +- .../models/tiny_potato/aromantictater.json | 2 +- .../models/tiny_potato/asexualtater.json | 2 +- .../quark/models/tiny_potato/aureylian.json | 2 +- .../quark/models/tiny_potato/bitater.json | 2 +- .../assets/quark/models/tiny_potato/bob.json | 4 +-- .../models/tiny_potato/bosniantater.json | 2 +- .../quark/models/tiny_potato/default.json | 2 +- .../quark/models/tiny_potato/dinnerbone.json | 2 +- .../quark/models/tiny_potato/enbytater.json | 2 +- .../models/tiny_potato/genderfluidtater.json | 2 +- .../quark/models/tiny_potato/graytater.json | 2 +- .../quark/models/tiny_potato/halloween.json | 2 +- .../models/tiny_potato/kingdaddydmac.json | 2 +- .../models/tiny_potato/lesbiantater.json | 2 +- .../quark/models/tiny_potato/pahimar.json | 2 +- .../quark/models/tiny_potato/pantater.json | 2 +- .../quark/models/tiny_potato/pridetater.json | 2 +- .../quark/models/tiny_potato/robotater.json | 2 +- .../quark/models/tiny_potato/snorps.json | 2 +- .../quark/models/tiny_potato/tatersus.json | 4 +-- .../quark/models/tiny_potato/tomater.json | 2 +- .../quark/models/tiny_potato/transtater.json | 2 +- .../{model => block}/tiny_potato/ace.png | Bin .../{model => block}/tiny_potato/agender.png | Bin .../{model => block}/tiny_potato/angry.png | Bin .../{model => block}/tiny_potato/aro.png | Bin .../tiny_potato/aureylian.png | Bin .../{model => block}/tiny_potato/bi.png | Bin .../{model => block}/tiny_potato/bob.png | Bin .../{model => block}/tiny_potato/bosnia.png | Bin .../{model => block}/tiny_potato/default.png | Bin .../tiny_potato/genderfluid.png | Bin .../{model => block}/tiny_potato/gray.png | Bin .../tiny_potato/halloween.png | Bin .../{model => block}/tiny_potato/lesbian.png | Bin .../{model => block}/tiny_potato/pan.png | Bin .../{model => block}/tiny_potato/pride.png | Bin .../{model => block}/tiny_potato/robo.png | Bin .../{model => block}/tiny_potato/sus.png | Bin .../{model => block}/tiny_potato/tomato.png | Bin .../{model => block}/tiny_potato/trans.png | Bin .../{model => block}/tiny_potato/wire.png | Bin src/main/resources/quark.mixins.json | 1 + 49 files changed, 63 insertions(+), 39 deletions(-) create mode 100644 src/main/java/org/violetmoon/quark/mixin/client/ModelManagerMixin.java rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/ace.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/agender.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/angry.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/aro.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/aureylian.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/bi.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/bob.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/bosnia.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/default.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/genderfluid.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/gray.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/halloween.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/lesbian.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/pan.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/pride.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/robo.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/sus.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/tomato.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/trans.png (100%) rename src/main/resources/assets/quark/textures/{model => block}/tiny_potato/wire.png (100%) diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java index 5c7ad6b087..38f66bf786 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java @@ -2,8 +2,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.Resource; @@ -15,10 +13,10 @@ import org.violetmoon.quark.addons.oddities.client.render.be.TinyPotatoRenderer; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.mixin.client.ModelManagerMixin; import org.violetmoon.zeta.advancement.ManualTrigger; import org.violetmoon.zeta.client.event.load.ZAddModels; import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.client.event.load.ZModelBakingCompleted; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZRegister; import org.violetmoon.zeta.module.ZetaLoadModule; @@ -52,14 +50,10 @@ public final void register(ZRegister event) { @ZetaLoadModule(clientReplacement = true) public static class Client extends TinyPotatoModule { - @LoadEvent - public void modelBake(ZModelBakingCompleted event) { - ResourceLocation tinyPotato = new ModelResourceLocation(new ResourceLocation("quark", "tiny_potato"), "inventory"); - Map map = event.getModels(); - BakedModel originalPotato = map.get(tinyPotato); - //fixme tater you fucker you crashed my game :c - //map.put(tinyPotato, new TinyPotatoModel(originalPotato)); - } + /** + * Moved to {@link ModelManagerMixin} + */ + public void modelBake() { } @LoadEvent public void registerAdditionalModels(ZAddModels event) { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/ModelManagerMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/ModelManagerMixin.java new file mode 100644 index 0000000000..0adcfe813a --- /dev/null +++ b/src/main/java/org/violetmoon/quark/mixin/client/ModelManagerMixin.java @@ -0,0 +1,28 @@ +package org.violetmoon.quark.mixin.client; + +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.profiling.ProfilerFiller; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.violetmoon.quark.addons.oddities.client.model.TinyPotatoModel; +import org.violetmoon.quark.base.Quark; + +import java.util.Map; + +@Mixin(ModelManager.class) +public class ModelManagerMixin { + @Shadow + private Map bakedRegistry; + + @Inject(at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/resources/model/ModelBakery;getBakedTopLevelModels()Ljava/util/Map;", shift = At.Shift.AFTER), method = "apply(Lnet/minecraft/client/resources/model/ModelManager$ReloadState;Lnet/minecraft/util/profiling/ProfilerFiller;)V") + private void onModelBake(ModelManager.ReloadState reloadState, ProfilerFiller profilerFiller, CallbackInfo ci) { + ModelResourceLocation key = new ModelResourceLocation(Quark.asResource("tiny_potato"), "inventory"); + bakedRegistry.put(key, new TinyPotatoModel(bakedRegistry.get(key))); + } +} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index c1338c9396..5ce755dba8 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -76,4 +76,5 @@ public-f net.minecraft.advancements.critereon.ItemUsedOnLocationTrigger$TriggerI public-f net.minecraft.advancements.critereon.ContextAwarePredicate f_285622_ # conditions public-f net.minecraft.advancements.critereon.ContextAwarePredicate f_285559_ # compositePredicates public net.minecraft.core.RegistrySetBuilder$BuildState -public net.minecraft.core.RegistrySetBuilder m_254900_(Lnet/minecraft/core/RegistryAccess;)Lnet/minecraft/core/RegistrySetBuilder$BuildState; # createState \ No newline at end of file +public net.minecraft.core.RegistrySetBuilder m_254900_(Lnet/minecraft/core/RegistryAccess;)Lnet/minecraft/core/RegistrySetBuilder$BuildState; # createState +public net.minecraft.client.resources.model.ModelManager$ReloadState \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/tiny_potato/acetater.json b/src/main/resources/assets/quark/models/tiny_potato/acetater.json index 746f6d448f..feb57687dd 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/acetater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/acetater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/ace" + "all": "quark:block/tiny_potato/ace" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/agendertater.json b/src/main/resources/assets/quark/models/tiny_potato/agendertater.json index badf9a6e31..b12a9a6c26 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/agendertater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/agendertater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/agender" + "all": "quark:block/tiny_potato/agender" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/angry.json b/src/main/resources/assets/quark/models/tiny_potato/angry.json index 5dc2f6fabb..93f5493ee4 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/angry.json +++ b/src/main/resources/assets/quark/models/tiny_potato/angry.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/angry" + "all": "quark:block/tiny_potato/angry" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/aromantictater.json b/src/main/resources/assets/quark/models/tiny_potato/aromantictater.json index 58fbf49f7c..99e37f45dc 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/aromantictater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/aromantictater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/aro" + "all": "quark:block/tiny_potato/aro" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/asexualtater.json b/src/main/resources/assets/quark/models/tiny_potato/asexualtater.json index 746f6d448f..feb57687dd 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/asexualtater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/asexualtater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/ace" + "all": "quark:block/tiny_potato/ace" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/aureylian.json b/src/main/resources/assets/quark/models/tiny_potato/aureylian.json index 7bc6fa14a7..e0a230f975 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/aureylian.json +++ b/src/main/resources/assets/quark/models/tiny_potato/aureylian.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/aureylian" + "all": "quark:block/tiny_potato/aureylian" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/bitater.json b/src/main/resources/assets/quark/models/tiny_potato/bitater.json index f7d5b45963..451b0ad5e1 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/bitater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/bitater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/bi" + "all": "quark:block/tiny_potato/bi" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/bob.json b/src/main/resources/assets/quark/models/tiny_potato/bob.json index 6f280d31f1..e7cfeadac7 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/bob.json +++ b/src/main/resources/assets/quark/models/tiny_potato/bob.json @@ -1,8 +1,8 @@ { "parent": "quark:tiny_potato/base", "textures": { - "particle": "quark:model/tiny_potato/bob", - "all": "quark:model/tiny_potato/bob" + "particle": "quark:block/tiny_potato/bob", + "all": "quark:block/tiny_potato/bob" }, "display": { "firstperson_righthand": { diff --git a/src/main/resources/assets/quark/models/tiny_potato/bosniantater.json b/src/main/resources/assets/quark/models/tiny_potato/bosniantater.json index 7d0ac4a1d6..d82e72288f 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/bosniantater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/bosniantater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/bosnia" + "all": "quark:block/tiny_potato/bosnia" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/default.json b/src/main/resources/assets/quark/models/tiny_potato/default.json index e6fc068207..93d7b111ac 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/default.json +++ b/src/main/resources/assets/quark/models/tiny_potato/default.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/default" + "all": "quark:block/tiny_potato/default" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/dinnerbone.json b/src/main/resources/assets/quark/models/tiny_potato/dinnerbone.json index 68476fd3b2..ed8d4c03b7 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/dinnerbone.json +++ b/src/main/resources/assets/quark/models/tiny_potato/dinnerbone.json @@ -1,7 +1,7 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/default" + "all": "quark:block/tiny_potato/default" }, "display": { "firstperson_righthand": { diff --git a/src/main/resources/assets/quark/models/tiny_potato/enbytater.json b/src/main/resources/assets/quark/models/tiny_potato/enbytater.json index 2233a0b60d..0130c3d970 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/enbytater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/enbytater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/wire" + "all": "quark:block/tiny_potato/wire" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/genderfluidtater.json b/src/main/resources/assets/quark/models/tiny_potato/genderfluidtater.json index cf5db14a9d..956617dea1 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/genderfluidtater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/genderfluidtater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/genderfluid" + "all": "quark:block/tiny_potato/genderfluid" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/graytater.json b/src/main/resources/assets/quark/models/tiny_potato/graytater.json index f788f4a372..0ec5d708cc 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/graytater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/graytater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/gray" + "all": "quark:block/tiny_potato/gray" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/halloween.json b/src/main/resources/assets/quark/models/tiny_potato/halloween.json index 0e70b1d0cf..1b6676821a 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/halloween.json +++ b/src/main/resources/assets/quark/models/tiny_potato/halloween.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/halloween" + "all": "quark:block/tiny_potato/halloween" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/kingdaddydmac.json b/src/main/resources/assets/quark/models/tiny_potato/kingdaddydmac.json index 18fa68d45e..8f4274dc19 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/kingdaddydmac.json +++ b/src/main/resources/assets/quark/models/tiny_potato/kingdaddydmac.json @@ -1,7 +1,7 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/default" + "all": "quark:block/tiny_potato/default" }, "display": { "firstperson_righthand": { diff --git a/src/main/resources/assets/quark/models/tiny_potato/lesbiantater.json b/src/main/resources/assets/quark/models/tiny_potato/lesbiantater.json index 4c7a4994d4..e8dfcab9fe 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/lesbiantater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/lesbiantater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/lesbian" + "all": "quark:block/tiny_potato/lesbian" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/pahimar.json b/src/main/resources/assets/quark/models/tiny_potato/pahimar.json index c6413c703a..9c97e2fadb 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/pahimar.json +++ b/src/main/resources/assets/quark/models/tiny_potato/pahimar.json @@ -1,7 +1,7 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/default" + "all": "quark:block/tiny_potato/default" }, "display": { "firstperson_righthand": { diff --git a/src/main/resources/assets/quark/models/tiny_potato/pantater.json b/src/main/resources/assets/quark/models/tiny_potato/pantater.json index 14216b9c00..85ea56f762 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/pantater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/pantater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/pan" + "all": "quark:block/tiny_potato/pan" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/pridetater.json b/src/main/resources/assets/quark/models/tiny_potato/pridetater.json index ff20ee33e2..fb43d7c4c0 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/pridetater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/pridetater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/pride" + "all": "quark:block/tiny_potato/pride" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/robotater.json b/src/main/resources/assets/quark/models/tiny_potato/robotater.json index b344493be8..138737b5c2 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/robotater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/robotater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/robo" + "all": "quark:block/tiny_potato/robo" } } diff --git a/src/main/resources/assets/quark/models/tiny_potato/snorps.json b/src/main/resources/assets/quark/models/tiny_potato/snorps.json index 33273fb354..624216b976 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/snorps.json +++ b/src/main/resources/assets/quark/models/tiny_potato/snorps.json @@ -1,7 +1,7 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/default" + "all": "quark:block/tiny_potato/default" }, "elements": [ { diff --git a/src/main/resources/assets/quark/models/tiny_potato/tatersus.json b/src/main/resources/assets/quark/models/tiny_potato/tatersus.json index 7271d9c0bf..325a7d5d76 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/tatersus.json +++ b/src/main/resources/assets/quark/models/tiny_potato/tatersus.json @@ -1,8 +1,8 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/default", - "glasses": "quark:model/tiny_potato/sus" + "all": "quark:block/tiny_potato/default", + "glasses": "quark:block/tiny_potato/sus" }, "elements": [ { diff --git a/src/main/resources/assets/quark/models/tiny_potato/tomater.json b/src/main/resources/assets/quark/models/tiny_potato/tomater.json index 15700711f5..887c14cc61 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/tomater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/tomater.json @@ -8,7 +8,7 @@ } }, "textures": { - "all": "quark:model/tiny_potato/tomato" + "all": "quark:block/tiny_potato/tomato" }, "elements": [ { diff --git a/src/main/resources/assets/quark/models/tiny_potato/transtater.json b/src/main/resources/assets/quark/models/tiny_potato/transtater.json index 84b919ca3d..9cd38e1220 100644 --- a/src/main/resources/assets/quark/models/tiny_potato/transtater.json +++ b/src/main/resources/assets/quark/models/tiny_potato/transtater.json @@ -1,6 +1,6 @@ { "parent": "quark:tiny_potato/base", "textures": { - "all": "quark:model/tiny_potato/trans" + "all": "quark:block/tiny_potato/trans" } } diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/ace.png b/src/main/resources/assets/quark/textures/block/tiny_potato/ace.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/ace.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/ace.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/agender.png b/src/main/resources/assets/quark/textures/block/tiny_potato/agender.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/agender.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/agender.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/angry.png b/src/main/resources/assets/quark/textures/block/tiny_potato/angry.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/angry.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/angry.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/aro.png b/src/main/resources/assets/quark/textures/block/tiny_potato/aro.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/aro.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/aro.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/aureylian.png b/src/main/resources/assets/quark/textures/block/tiny_potato/aureylian.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/aureylian.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/aureylian.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/bi.png b/src/main/resources/assets/quark/textures/block/tiny_potato/bi.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/bi.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/bi.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/bob.png b/src/main/resources/assets/quark/textures/block/tiny_potato/bob.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/bob.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/bob.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/bosnia.png b/src/main/resources/assets/quark/textures/block/tiny_potato/bosnia.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/bosnia.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/bosnia.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/default.png b/src/main/resources/assets/quark/textures/block/tiny_potato/default.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/default.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/default.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/genderfluid.png b/src/main/resources/assets/quark/textures/block/tiny_potato/genderfluid.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/genderfluid.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/genderfluid.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/gray.png b/src/main/resources/assets/quark/textures/block/tiny_potato/gray.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/gray.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/gray.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/halloween.png b/src/main/resources/assets/quark/textures/block/tiny_potato/halloween.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/halloween.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/halloween.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/lesbian.png b/src/main/resources/assets/quark/textures/block/tiny_potato/lesbian.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/lesbian.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/lesbian.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/pan.png b/src/main/resources/assets/quark/textures/block/tiny_potato/pan.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/pan.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/pan.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/pride.png b/src/main/resources/assets/quark/textures/block/tiny_potato/pride.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/pride.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/pride.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/robo.png b/src/main/resources/assets/quark/textures/block/tiny_potato/robo.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/robo.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/robo.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/sus.png b/src/main/resources/assets/quark/textures/block/tiny_potato/sus.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/sus.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/sus.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/tomato.png b/src/main/resources/assets/quark/textures/block/tiny_potato/tomato.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/tomato.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/tomato.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/trans.png b/src/main/resources/assets/quark/textures/block/tiny_potato/trans.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/trans.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/trans.png diff --git a/src/main/resources/assets/quark/textures/model/tiny_potato/wire.png b/src/main/resources/assets/quark/textures/block/tiny_potato/wire.png similarity index 100% rename from src/main/resources/assets/quark/textures/model/tiny_potato/wire.png rename to src/main/resources/assets/quark/textures/block/tiny_potato/wire.png diff --git a/src/main/resources/quark.mixins.json b/src/main/resources/quark.mixins.json index ab84384d27..faed687c78 100644 --- a/src/main/resources/quark.mixins.json +++ b/src/main/resources/quark.mixins.json @@ -90,6 +90,7 @@ "client.LoomScreenMixin", "client.MinecartSoundInstanceMixin", "client.MinecraftMixin", + "client.ModelManagerMixin", "client.ParrotRendererMixin", "client.PistonTileEntityRendererMixin", "client.RenderBuffersMixin",