add new stuff from porting lib, fix shader callback

Fabricators-of-Create · Jul 14, 2023 · c0b53fa · c0b53fa
1 parent 92266d6
commit c0b53fa
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -32,9 +32,9 @@ reach_entity_attributes_version = 2.4.0
 registrate_version = 1.3.59-MC1.20
 milk_lib_version = 1.2.60
 
-port_lib_version = 2.1.1045+1.20
+port_lib_version = 2.1.1046+1.20
 # adding a module also requires adding a dependency to the FMJ
-port_lib_modules = accessors,base,entity,extensions,fake_players,networking,obj_loader,tags,transfer
+port_lib_modules = accessors,base,entity,extensions,fake_players,networking,obj_loader,tags,transfer,models,tool_actions
 
 night_config_version = 3.6.3
 jsr305_version = 3.0.2

diff --git a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java
@@ -5,6 +5,7 @@
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.utility.Iterate;
 
+import io.github.fabricators_of_create.porting_lib.model.CustomParticleIconModel;
 import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
 import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachedBlockView;

diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java b/src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java
@@ -8,6 +8,8 @@
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 
 import io.github.fabricators_of_create.porting_lib.enchant.CustomEnchantingBehaviorItem;
+import io.github.fabricators_of_create.porting_lib.item.CustomEnchantmentLevelItem;
+import io.github.fabricators_of_create.porting_lib.item.CustomEnchantmentsItem;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.effect.MobEffectInstance;

diff --git a/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesModel.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesModel.java
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
 
+import io.github.fabricators_of_create.porting_lib.models.TransformTypeDependentItemBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.world.item.ItemDisplayContext;

diff --git a/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java
@@ -11,6 +11,8 @@
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.AxeItemAccessor;
+import io.github.fabricators_of_create.porting_lib.tool.ToolAction;
+import io.github.fabricators_of_create.porting_lib.tool.ToolActions;
 import io.github.fabricators_of_create.porting_lib.util.NBTSerializer;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;

diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltModel.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltModel.java
@@ -8,6 +8,7 @@
 import com.simibubi.create.content.kinetics.belt.BeltBlockEntity.RenderData;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
 
+import io.github.fabricators_of_create.porting_lib.model.CustomParticleIconModel;
 import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.model.SpriteFinder;

diff --git a/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java b/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java
@@ -2,6 +2,7 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
+import io.github.fabricators_of_create.porting_lib.models.TransformTypeDependentItemBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.world.item.ItemDisplayContext;

diff --git a/src/main/java/com/simibubi/create/foundation/render/MultiRenderTypeModel.java b/src/main/java/com/simibubi/create/foundation/render/MultiRenderTypeModel.java
@@ -9,6 +9,8 @@
 
 import com.simibubi.create.Create;
 
+import io.github.fabricators_of_create.porting_lib.models.CompositeModel;
+import io.github.fabricators_of_create.porting_lib.models.CompositeModel.Baked;
 import net.fabricmc.fabric.api.renderer.v1.Renderer;
 import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
 import net.fabricmc.fabric.api.renderer.v1.material.BlendMode;
@@ -18,7 +20,6 @@
 import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
-import vazkii.botania.fabric.client.FabricFloatingFlowerModel.Baked;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;
@@ -69,7 +70,7 @@ public static BakedModel forDisplayLink(BakedModel wrapped) {
 	}
 
 	protected FabricBakedModel getPart(String name) {
-		return ((FabricBakedModel) ((Baked) wrapped).getPart(name));
+		return ((Baked) wrapped).getPart(name);
 	}
 
 	protected static boolean setMaterial(MutableQuadView quad, RenderMaterial material) {

diff --git a/src/main/java/com/simibubi/create/foundation/render/RenderTypes.java b/src/main/java/com/simibubi/create/foundation/render/RenderTypes.java
@@ -9,13 +9,14 @@
 import com.simibubi.create.Create;
 
 import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.RenderTypeAccessor;
+import net.fabricmc.fabric.api.client.rendering.v1.CoreShaderRegistrationCallback;
+import net.fabricmc.fabric.api.client.rendering.v1.CoreShaderRegistrationCallback.RegistrationContext;
 
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.RenderStateShard;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.inventory.InventoryMenu;
 
 // TODO 1.17: use custom shaders instead of vanilla ones
@@ -148,14 +149,14 @@ private RenderTypes() {
 	}
 
 	public static void init() {
-		RegisterShadersCallback.EVENT.register(Shaders::onRegisterShaders);
+		CoreShaderRegistrationCallback.EVENT.register(Shaders::onRegisterShaders);
 	}
 
 	private static class Shaders {
 		private static ShaderInstance glowingShader;
 
-		public static void onRegisterShaders(ResourceManager resourceManager, ShaderRegistry shaderRegistry) throws IOException {
-			shaderRegistry.registerShader(new ShaderInstance(resourceManager, Create.asResource("glowing_shader").toString(), DefaultVertexFormat.NEW_ENTITY), shader -> glowingShader = shader);
+		public static void onRegisterShaders(RegistrationContext ctx) throws IOException {
+			ctx.register(Create.asResource("glowing_shader"), DefaultVertexFormat.NEW_ENTITY, shader -> glowingShader = shader);
 		}
 	}
 

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -62,6 +62,7 @@
     "porting_lib_obj_loader": ">=${port_lib_obj_loader_version}",
     "forge_tags": ">=${port_lib_tags_version}",
     "porting_lib_transfer": ">=${port_lib_transfer_version}",
+    "porting_lib_models": ">=${port_lib_models_version}",
 
     "forgeconfigapiport": ">=${forge_config_version}",
     "milk": ">=${milk_lib_version}",