Sync with upstream trinkets

PolymerPorts · Jul 26, 2024 · febdf4a · febdf4a
1 parent 5249066
commit febdf4a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ cloth_config_version=14.0.126
 port_version=2
 
 
-polymer_version=0.9.1+1.21
+polymer_version=0.9.7+1.21
 sgui_version=1.6.0+1.21
 translation_version=2.3.1+1.21-pre2
 pda_version=0.6.0+1.21
diff --git a/src/main/java/dev/emi/trinkets/api/LivingEntityTrinketComponent.java b/src/main/java/dev/emi/trinkets/api/LivingEntityTrinketComponent.java
@@ -15,13 +15,9 @@
 import com.google.common.collect.Multimap;
 
 import dev.emi.trinkets.TrinketModifiers;
-import dev.emi.trinkets.TrinketPlayerScreenHandler;
-import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.entry.RegistryEntry;
 import org.ladysnake.cca.api.v3.component.Component;
-import net.fabricmc.fabric.api.util.NbtType;
-import net.minecraft.util.Identifier;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.attribute.EntityAttribute;
 import net.minecraft.entity.attribute.EntityAttributeModifier;

diff --git a/src/testmod/java/dev/emi/trinkets/TestTrinket2.java b/src/testmod/java/dev/emi/trinkets/TestTrinket2.java
@@ -3,30 +3,24 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
-import dev.emi.trinkets.api.SlotAttributes;
 import dev.emi.trinkets.api.SlotReference;
 import dev.emi.trinkets.api.TrinketItem;
-import dev.emi.trinkets.api.client.TrinketRenderer;
-import dev.emi.trinkets.client.TrinketModel;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.model.BipedEntityModel;
-import net.minecraft.client.render.entity.model.EntityModel;
-import net.minecraft.client.util.math.MatrixStack;
+import eu.pb4.polymer.core.api.item.PolymerItem;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.attribute.EntityAttribute;
 import net.minecraft.entity.attribute.EntityAttributeModifier;
 import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 
-public class TestTrinket2 extends TrinketItem {
+public class TestTrinket2 extends TrinketItem implements PolymerItem {
 
 	public TestTrinket2(Settings settings) {
 		super(settings);
@@ -43,4 +37,9 @@ public Multimap<RegistryEntry<EntityAttribute>, EntityAttributeModifier> getModi
 		modifiers.put(EntityAttributes.GENERIC_MOVEMENT_SPEED, speedModifier);
 		return modifiers;
 	}
+
+	@Override
+	public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
+		return Items.FEATHER;
+	}
 }