FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-14 19:25:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use identifier path composition methods (#3820)

Browse source
This commit is contained in:
haykam821 2024-06-08 09:02:41 -04:00 committed by GitHub
parent 18dd60fee4
commit d1321076fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/EntityModelLayersMixin.java
View file

@ -32,7 +32,7 @@ public class EntityModelLayersMixin {
private static void createSign(WoodType type, CallbackInfoReturnable<EntityModelLayer> cir) {
if (type.name().indexOf(Identifier.NAMESPACE_SEPARATOR) != -1) {
Identifier identifier = Identifier.of(type.name());
cir.setReturnValue(new EntityModelLayer(Identifier.of(identifier.getNamespace(), "sign/" + identifier.getPath()), "main"));
cir.setReturnValue(new EntityModelLayer(identifier.withPrefixedPath("sign/"), "main"));
}
}
@ -40,7 +40,7 @@ public class EntityModelLayersMixin {
private static void createHangingSign(WoodType type, CallbackInfoReturnable<EntityModelLayer> cir) {
if (type.name().indexOf(Identifier.NAMESPACE_SEPARATOR) != -1) {
Identifier identifier = Identifier.of(type.name());
cir.setReturnValue(new EntityModelLayer(Identifier.of(identifier.getNamespace(), "hanging_sign/" + identifier.getPath()), "main"));
cir.setReturnValue(new EntityModelLayer(identifier.withPrefixedPath("hanging_sign/"), "main"));
}
}
}

2
fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/HangingSignEditScreenMixin.java
View file

@ -36,7 +36,7 @@ public abstract class HangingSignEditScreenMixin extends AbstractSignEditScreen
private Identifier init(String id, Operation<Identifier> original) {
if (signType.name().indexOf(Identifier.NAMESPACE_SEPARATOR) != -1) {
Identifier identifier = Identifier.of(signType.name());
return Identifier.of(identifier.getNamespace(), "textures/gui/hanging_signs/" + identifier.getPath() + ".png");
return identifier.withPath(path -> "textures/gui/hanging_signs/" + path + ".png");
}
return original.call(id);

2
fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/FabricShaderProgram.java
View file

@ -40,6 +40,6 @@ public final class FabricShaderProgram extends ShaderProgram {
*/
public static Identifier rewriteAsId(String input, String containedId) {
Identifier contained = Identifier.of(containedId);
return Identifier.of(contained.getNamespace(), input.replace(containedId, contained.getPath()));
return contained.withPath(path -> input.replace(containedId, path));
}
}