尝试调整仅客户端方法

This commit is contained in:
17146 2025-04-12 03:43:09 +08:00
parent 8b50a729b8
commit 2bcefece6a
40 changed files with 160 additions and 104 deletions

View file

@ -5,6 +5,8 @@ import net.minecraft.client.model.HumanoidModel;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.HumanoidArm;
import net.minecraft.world.item.Rarity;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.fml.common.asm.enumextension.EnumProxy;
import net.neoforged.neoforge.client.IArmPoseTransformer;
@ -21,20 +23,24 @@ public class ModEnumExtensions {
return SUPERBWARFARE_LEGENDARY.getValue();
}
public static final EnumProxy<HumanoidModel.ArmPose> SUPERBWARFARE_LUNGE_MINE_POSE = new EnumProxy<>(
HumanoidModel.ArmPose.class,
false,
(IArmPoseTransformer) (model, entity, arm) -> {
if (arm != HumanoidArm.LEFT) {
model.rightArm.xRot = 20f * Mth.DEG_TO_RAD + model.head.xRot;
model.rightArm.yRot = -12f * Mth.DEG_TO_RAD;
model.leftArm.xRot = -45f * Mth.DEG_TO_RAD + model.head.xRot;
model.leftArm.yRot = 40f * Mth.DEG_TO_RAD;
}
}
);
@OnlyIn(Dist.CLIENT)
public static class Client {
public static HumanoidModel.ArmPose getLungeMinePose() {
return SUPERBWARFARE_LUNGE_MINE_POSE.getValue();
public static final EnumProxy<HumanoidModel.ArmPose> SUPERBWARFARE_LUNGE_MINE_POSE = new EnumProxy<>(
HumanoidModel.ArmPose.class,
false,
(IArmPoseTransformer) (model, entity, arm) -> {
if (arm != HumanoidArm.LEFT) {
model.rightArm.xRot = 20f * Mth.DEG_TO_RAD + model.head.xRot;
model.rightArm.yRot = -12f * Mth.DEG_TO_RAD;
model.leftArm.xRot = -45f * Mth.DEG_TO_RAD + model.head.xRot;
model.leftArm.yRot = 40f * Mth.DEG_TO_RAD;
}
}
);
public static HumanoidModel.ArmPose getLungeMinePose() {
return SUPERBWARFARE_LUNGE_MINE_POSE.getValue();
}
}
}

View file

@ -3,6 +3,8 @@ package com.atsuishio.superbwarfare.item;
import net.minecraft.world.item.Item;
import software.bernie.geckolib.renderer.GeoItemRenderer;
import java.util.function.Supplier;
public interface CustomRendererItem {
GeoItemRenderer<? extends Item> getRenderer();
Supplier<GeoItemRenderer<? extends Item>> getRenderer();
}

View file

@ -62,7 +62,7 @@ public class LungeMine extends Item implements GeoItem {
public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) {
if (!itemStack.isEmpty()) {
if (entityLiving.getUsedItemHand() == hand) {
return ModEnumExtensions.getLungeMinePose();
return ModEnumExtensions.Client.getLungeMinePose();
}
}
return HumanoidModel.ArmPose.EMPTY;

View file

@ -513,7 +513,7 @@ public abstract class GunItem extends Item implements CustomRendererItem {
for (var item : ModItems.GUNS.getEntries()) {
if (item.get() instanceof GunItem gun) {
event.registerItem(new IClientItemExtensions() {
private final BlockEntityWithoutLevelRenderer renderer = gun.getRenderer();
private final BlockEntityWithoutLevelRenderer renderer = gun.getRenderer().get();
@Override
public @NotNull BlockEntityWithoutLevelRenderer getCustomRenderer() {

View file

@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -25,6 +26,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class Glock17Item extends GunItem implements GeoItem {
@ -36,8 +38,8 @@ public class Glock17Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new Glock17ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return Glock17ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {
@ -81,7 +83,6 @@ public class Glock17Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
}
@Override
public void registerControllers(AnimatableManager.ControllerRegistrar data) {
var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate);

View file

@ -14,6 +14,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -26,6 +27,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class Glock18Item extends GunItem implements GeoItem {
@ -37,8 +39,8 @@ public class Glock18Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new Glock18ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return Glock18ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {
@ -81,7 +83,6 @@ public class Glock18Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
}
@Override
public void registerControllers(AnimatableManager.ControllerRegistrar data) {
var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate);

View file

@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -25,6 +26,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class M1911Item extends GunItem implements GeoItem {
@ -36,8 +38,8 @@ public class M1911Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new M1911ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return M1911ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {
@ -58,7 +60,6 @@ public class M1911Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_normal"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
}
@ -81,7 +82,6 @@ public class M1911Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
}
@Override
public void registerControllers(AnimatableManager.ControllerRegistrar data) {
var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate);

View file

@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -25,6 +26,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class Mp443Item extends GunItem implements GeoItem {
@ -36,8 +38,8 @@ public class Mp443Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new Mp443ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return Mp443ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {
@ -58,7 +60,6 @@ public class Mp443Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_normal"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
}
@ -81,7 +82,6 @@ public class Mp443Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
}
@Override
public void registerControllers(AnimatableManager.ControllerRegistrar data) {
var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate);

View file

@ -19,10 +19,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.*;
import net.minecraft.world.level.Level;
import software.bernie.geckolib.animatable.GeoItem;
import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache;
@ -33,6 +30,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.List;
import java.util.Set;
import java.util.function.Supplier;
public class Trachelium extends GunItem implements GeoItem {
@ -49,8 +47,8 @@ public class Trachelium extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new TracheliumItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return TracheliumItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {
@ -227,7 +225,6 @@ public class Trachelium extends GunItem implements GeoItem {
TooltipTool.addHideText(list, Component.translatable("des.superbwarfare.trachelium_4").withStyle(Style.EMPTY.withColor(0xF4F0FF)));
}
@Override
@ParametersAreNonnullByDefault
public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) {

View file

@ -18,6 +18,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import software.bernie.geckolib.animatable.GeoItem;
@ -27,6 +28,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class Ntw20Item extends GunItem implements GeoItem {
@ -43,8 +45,8 @@ public class Ntw20Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new Ntw20Renderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return Ntw20Renderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -51,6 +51,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
public class JavelinItem extends GunItem implements GeoItem, SpecialFireWeapon {
@ -62,8 +63,8 @@ public class JavelinItem extends GunItem implements GeoItem, SpecialFireWeapon {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new JavelinItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return JavelinItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -44,6 +44,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
public class M79Item extends GunItem implements GeoItem, SpecialFireWeapon {
@ -60,8 +61,8 @@ public class M79Item extends GunItem implements GeoItem, SpecialFireWeapon {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new M79ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return M79ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -46,6 +46,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class RpgItem extends GunItem implements GeoItem, SpecialFireWeapon {
@ -62,8 +63,8 @@ public class RpgItem extends GunItem implements GeoItem, SpecialFireWeapon {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new RpgItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return RpgItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -45,6 +45,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.ArrayList;
import java.util.Optional;
import java.util.function.Supplier;
public class SecondaryCataclysm extends GunItem implements GeoItem, SpecialFireWeapon, EnergyStorageItem {
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
@ -72,8 +73,8 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, SpecialFireW
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new SecondaryCataclysmRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return SecondaryCataclysmRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -14,6 +14,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -24,6 +25,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class DevotionItem extends GunItem implements GeoItem {
@ -35,8 +37,8 @@ public class DevotionItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new DevotionItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return DevotionItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -15,6 +15,7 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -29,6 +30,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class M60Item extends GunItem implements GeoItem {
@ -40,8 +42,8 @@ public class M60Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new M60ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return M60ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -20,6 +20,7 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
@ -32,6 +33,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.function.Supplier;
public class MinigunItem extends GunItem implements GeoItem {
@Override
@ -64,8 +66,8 @@ public class MinigunItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new MinigunItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return MinigunItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -19,6 +19,7 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -31,6 +32,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Set;
import java.util.function.Supplier;
public class RpkItem extends GunItem implements GeoItem {
@ -42,8 +44,8 @@ public class RpkItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new RpkItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return RpkItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -27,6 +28,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class AK12Item extends GunItem implements GeoItem {
@ -43,8 +45,8 @@ public class AK12Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new AK12ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return AK12ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -27,6 +28,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class AK47Item extends GunItem implements GeoItem {
@ -43,8 +45,8 @@ public class AK47Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new AK47ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return AK47ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -27,6 +28,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class Hk416Item extends GunItem implements GeoItem {
@ -38,8 +40,8 @@ public class Hk416Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new Hk416ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return Hk416ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -24,6 +24,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class InsidiousItem extends GunItem implements GeoItem {
@ -35,8 +36,8 @@ public class InsidiousItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends Item> getRenderer() {
return new InsidiousItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return InsidiousItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -27,6 +28,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class M4Item extends GunItem implements GeoItem {
@ -38,8 +40,8 @@ public class M4Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new M4ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return M4ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -23,6 +24,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class MarlinItem extends GunItem implements GeoItem {
@ -34,8 +36,8 @@ public class MarlinItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new MarlinItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return MarlinItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -29,6 +30,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class Mk14Item extends GunItem implements GeoItem {
@ -40,8 +42,8 @@ public class Mk14Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new Mk14ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return Mk14ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -18,6 +18,7 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -32,6 +33,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class Qbz95Item extends GunItem implements GeoItem {
@ -43,8 +45,8 @@ public class Qbz95Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new Qbz95ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return Qbz95ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -14,6 +14,7 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -28,6 +29,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class SksItem extends GunItem implements GeoItem {
@ -44,8 +46,8 @@ public class SksItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new SksItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return SksItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -17,6 +17,7 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import org.jetbrains.annotations.NotNull;
@ -28,6 +29,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
public class Aa12Item extends GunItem implements GeoItem {
@ -40,8 +42,8 @@ public class Aa12Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new Aa12ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return Aa12ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -15,6 +15,7 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -27,6 +28,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
public class HomemadeShotgunItem extends GunItem implements GeoItem {
@ -43,8 +45,8 @@ public class HomemadeShotgunItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new HomemadeShotgunItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return HomemadeShotgunItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -15,6 +15,7 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -27,6 +28,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
public class M870Item extends GunItem implements GeoItem {
@ -38,8 +40,8 @@ public class M870Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new M870ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return M870ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -17,6 +17,7 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -29,6 +30,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Set;
import java.util.function.Supplier;
public class VectorItem extends GunItem implements GeoItem {
@ -107,8 +109,8 @@ public class VectorItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new VectorItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return VectorItemRenderer::new;
}
// TODO 移除inventoryTick

View file

@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -23,6 +24,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class HuntingRifleItem extends GunItem implements GeoItem {
@ -39,8 +41,8 @@ public class HuntingRifleItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new HuntingRifleItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return HuntingRifleItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -23,6 +24,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class K98Item extends GunItem implements GeoItem {
@ -34,8 +36,8 @@ public class K98Item extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new K98ItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return K98ItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -23,6 +24,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class M98bItem extends GunItem implements GeoItem {
@ -34,8 +36,8 @@ public class M98bItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new M98bItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return M98bItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -23,6 +24,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Set;
import java.util.function.Supplier;
public class MosinNagantItem extends GunItem implements GeoItem {
@ -34,8 +36,8 @@ public class MosinNagantItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new MosinNagantItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return MosinNagantItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -17,6 +17,7 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.capabilities.Capabilities;
@ -29,6 +30,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
public class SentinelItem extends GunItem implements GeoItem, EnergyStorageItem {
@ -58,8 +60,8 @@ public class SentinelItem extends GunItem implements GeoItem, EnergyStorageItem
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new SentinelItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return SentinelItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -29,6 +30,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class SvdItem extends GunItem implements GeoItem {
@ -40,8 +42,8 @@ public class SvdItem extends GunItem implements GeoItem {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new SvdItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return SvdItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -25,10 +25,7 @@ import net.minecraft.sounds.SoundSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.*;
import net.minecraft.world.level.Level;
import net.neoforged.neoforge.network.PacketDistributor;
import org.jetbrains.annotations.NotNull;
@ -40,6 +37,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Optional;
import java.util.function.Supplier;
import static com.atsuishio.superbwarfare.network.message.send.FireMessage.spawnBullet;
@ -53,8 +51,8 @@ public class BocekItem extends GunItem implements GeoItem, SpecialFireWeapon {
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new BocekItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return BocekItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -42,6 +42,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
public class TaserItem extends GunItem implements GeoItem, SpecialFireWeapon, EnergyStorageItem {
@ -50,7 +51,6 @@ public class TaserItem extends GunItem implements GeoItem, SpecialFireWeapon, En
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
public static ItemDisplayContext transformType;
public TaserItem() {
super(new Properties().stacksTo(1).rarity(Rarity.COMMON));
}
@ -78,8 +78,8 @@ public class TaserItem extends GunItem implements GeoItem, SpecialFireWeapon, En
}
@Override
public GeoItemRenderer<? extends GunItem> getRenderer() {
return new TaserItemRenderer();
public Supplier<GeoItemRenderer<? extends Item>> getRenderer() {
return TaserItemRenderer::new;
}
public void getTransformType(ItemDisplayContext type) {

View file

@ -14,7 +14,7 @@
"name": "SUPERBWARFARE_LUNGE_MINE_POSE",
"constructor": "(ZLnet/neoforged/neoforge/client/IArmPoseTransformer;)V",
"parameters": {
"class": "com/atsuishio/superbwarfare/init/ModEnumExtensions",
"class": "com/atsuishio/superbwarfare/init/ModEnumExtensions$Client",
"field": "SUPERBWARFARE_LUNGE_MINE_POSE"
}
}