调整部分物品类名和位置
This commit is contained in:
17146
Light_Quanta
parent
90766787c6
commit
8c80e1b397
15 changed files with 63 additions and 58 deletions
|
|
@ -1,24 +1,24 @@
|
|||
package com.atsuishio.superbwarfare.client.model.item;
|
||||
|
||||
import com.atsuishio.superbwarfare.Mod;
|
||||
import com.atsuishio.superbwarfare.item.common.ammo.Rocket;
|
||||
import com.atsuishio.superbwarfare.item.common.ammo.RocketItem;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import software.bernie.geckolib.model.GeoModel;
|
||||
|
||||
public class RocketItemModel extends GeoModel<Rocket> {
|
||||
public class RocketItemModel extends GeoModel<RocketItem> {
|
||||
|
||||
@Override
|
||||
public ResourceLocation getAnimationResource(Rocket animatable) {
|
||||
public ResourceLocation getAnimationResource(RocketItem animatable) {
|
||||
return Mod.loc("animations/rpg.head.animation.json");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getModelResource(Rocket animatable) {
|
||||
public ResourceLocation getModelResource(RocketItem animatable) {
|
||||
return Mod.loc("geo/rpg.head.geo.json");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTextureResource(Rocket animatable) {
|
||||
public ResourceLocation getTextureResource(RocketItem animatable) {
|
||||
return Mod.loc("textures/entity/rpg_rocket.png");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
package com.atsuishio.superbwarfare.client.model.item;
|
||||
|
||||
import com.atsuishio.superbwarfare.Mod;
|
||||
import com.atsuishio.superbwarfare.item.Tm62;
|
||||
import com.atsuishio.superbwarfare.item.Tm62Item;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import software.bernie.geckolib.model.GeoModel;
|
||||
|
||||
public class Tm62ItemModel extends GeoModel<Tm62> {
|
||||
public class Tm62ItemModel extends GeoModel<Tm62Item> {
|
||||
|
||||
@Override
|
||||
public ResourceLocation getAnimationResource(Tm62 animatable) {
|
||||
public ResourceLocation getAnimationResource(Tm62Item animatable) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getModelResource(Tm62 animatable) {
|
||||
public ResourceLocation getModelResource(Tm62Item animatable) {
|
||||
return Mod.loc("geo/tm_62.geo.json");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTextureResource(Tm62 animatable) {
|
||||
public ResourceLocation getTextureResource(Tm62Item animatable) {
|
||||
return Mod.loc("textures/entity/tm_62.png");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
package com.atsuishio.superbwarfare.client.renderer.item;
|
||||
|
||||
import com.atsuishio.superbwarfare.client.model.item.RocketItemModel;
|
||||
import com.atsuishio.superbwarfare.item.common.ammo.Rocket;
|
||||
import com.atsuishio.superbwarfare.item.common.ammo.RocketItem;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import software.bernie.geckolib.renderer.GeoItemRenderer;
|
||||
|
||||
public class RocketItemRenderer extends GeoItemRenderer<Rocket> {
|
||||
public class RocketItemRenderer extends GeoItemRenderer<RocketItem> {
|
||||
|
||||
public RocketItemRenderer() {
|
||||
super(new RocketItemModel());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTextureLocation(Rocket instance) {
|
||||
public ResourceLocation getTextureLocation(RocketItem instance) {
|
||||
return super.getTextureLocation(instance);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
package com.atsuishio.superbwarfare.client.renderer.item;
|
||||
|
||||
import com.atsuishio.superbwarfare.client.model.item.Tm62ItemModel;
|
||||
import com.atsuishio.superbwarfare.item.Tm62;
|
||||
import com.atsuishio.superbwarfare.item.Tm62Item;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import software.bernie.geckolib.renderer.GeoItemRenderer;
|
||||
|
||||
public class Tm62ItemRenderer extends GeoItemRenderer<Tm62> {
|
||||
public class Tm62ItemRenderer extends GeoItemRenderer<Tm62Item> {
|
||||
|
||||
public Tm62ItemRenderer() {
|
||||
super(new Tm62ItemModel());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTextureLocation(Tm62 instance) {
|
||||
public ResourceLocation getTextureLocation(Tm62Item instance) {
|
||||
return super.getTextureLocation(instance);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,22 +108,22 @@ public class ModItems {
|
|||
public static final DeferredHolder<Item, Item> JAVELIN_MISSILE = AMMO.register("javelin_missile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredHolder<Item, MortarShell> MORTAR_SHELL = AMMO.register("mortar_shell", MortarShell::new);
|
||||
public static final DeferredHolder<Item, PotionMortarShell> POTION_MORTAR_SHELL = AMMO.register("potion_mortar_shell", PotionMortarShell::new);
|
||||
public static final DeferredHolder<Item, Rocket> ROCKET = AMMO.register("rocket", Rocket::new);
|
||||
public static final DeferredHolder<Item, RocketItem> ROCKET = AMMO.register("rocket", RocketItem::new);
|
||||
public static final DeferredHolder<Item, LungeMine> LUNGE_MINE = AMMO.register("lunge_mine", LungeMine::new);
|
||||
public static final DeferredHolder<Item, Item> HE_5_INCHES = AMMO.register("he_5_inches", () -> new CannonShellItem(new Item.Properties().rarity(Rarity.RARE)));
|
||||
public static final DeferredHolder<Item, Item> AP_5_INCHES = AMMO.register("ap_5_inches", () -> new CannonShellItem(new Item.Properties().rarity(Rarity.RARE)));
|
||||
public static final DeferredHolder<Item, HandGrenade> HAND_GRENADE = AMMO.register("hand_grenade", HandGrenade::new);
|
||||
public static final DeferredHolder<Item, RgoGrenade> RGO_GRENADE = AMMO.register("rgo_grenade", RgoGrenade::new);
|
||||
public static final DeferredHolder<Item, ClaymoreMine> CLAYMORE_MINE = AMMO.register("claymore_mine", ClaymoreMine::new);
|
||||
public static final DeferredHolder<Item, Tm62> TM_62 = AMMO.register("tm_62", Tm62::new);
|
||||
public static final DeferredHolder<Item, C4Bomb> C4_BOMB = AMMO.register("c4_bomb", C4Bomb::new);
|
||||
public static final DeferredHolder<Item, Blu43Mine> BLU_43_MINE = AMMO.register("blu_43_mine", Blu43Mine::new);
|
||||
public static final DeferredHolder<Item, Tm62Item> TM_62 = AMMO.register("tm_62", Tm62Item::new);
|
||||
public static final DeferredHolder<Item, C4BombItem> C4_BOMB = AMMO.register("c4_bomb", C4BombItem::new);
|
||||
public static final DeferredHolder<Item, Blu43MineItem> BLU_43_MINE = AMMO.register("blu_43_mine", Blu43MineItem::new);
|
||||
public static final DeferredHolder<Item, Item> SMALL_SHELL = AMMO.register("small_shell", SmallShellItem::new);
|
||||
public static final DeferredHolder<Item, Item> ROCKET_70 = AMMO.register("rocket_70", Rocket70::new);
|
||||
public static final DeferredHolder<Item, WireGuideMissile> WIRE_GUIDE_MISSILE = AMMO.register("wire_guide_missile", WireGuideMissile::new);
|
||||
public static final DeferredHolder<Item, Agm> AGM = AMMO.register("agm", Agm::new);
|
||||
public static final DeferredHolder<Item, SwarmDrone> SWARM_DRONE = AMMO.register("swarm_drone", SwarmDrone::new);
|
||||
public static final DeferredHolder<Item, MediumAerialBomb> MEDIUM_AERIAL_BOMB = AMMO.register("medium_aerial_bomb", MediumAerialBomb::new);
|
||||
public static final DeferredHolder<Item, Rocket70Item> ROCKET_70 = AMMO.register("rocket_70", Rocket70Item::new);
|
||||
public static final DeferredHolder<Item, WireGuideMissileItem> WIRE_GUIDE_MISSILE = AMMO.register("wire_guide_missile", WireGuideMissileItem::new);
|
||||
public static final DeferredHolder<Item, AgmItem> AGM = AMMO.register("agm", AgmItem::new);
|
||||
public static final DeferredHolder<Item, SwarmDroneItem> SWARM_DRONE = AMMO.register("swarm_drone", SwarmDroneItem::new);
|
||||
public static final DeferredHolder<Item, MediumAerialBombItem> MEDIUM_AERIAL_BOMB = AMMO.register("medium_aerial_bomb", MediumAerialBombItem::new);
|
||||
public static final DeferredHolder<Item, BeamTest> BEAM_TEST = AMMO.register("beam_test", BeamTest::new);
|
||||
|
||||
/**
|
||||
|
|
@ -341,15 +341,15 @@ public class ModItems {
|
|||
}
|
||||
}
|
||||
|
||||
DispenserBlock.registerBehavior(SWARM_DRONE.get(), new SwarmDrone.SwarmDroneDispenseBehavior());
|
||||
DispenserBlock.registerBehavior(C4_BOMB.get(), new C4Bomb.C4DispenseItemBehavior());
|
||||
DispenserBlock.registerBehavior(SWARM_DRONE.get(), new SwarmDroneItem.SwarmDroneDispenseBehavior());
|
||||
DispenserBlock.registerBehavior(C4_BOMB.get(), new C4BombItem.C4DispenseItemBehavior());
|
||||
DispenserBlock.registerBehavior(CLAYMORE_MINE.get(), new ClaymoreMine.ClaymoreDispenseBehavior());
|
||||
DispenserBlock.registerBehavior(BLU_43_MINE.get(), new Blu43Mine.Blu43MineDispenseBehavior());
|
||||
DispenserBlock.registerBehavior(ROCKET.get(), new Rocket.RocketDispenseBehavior());
|
||||
DispenserBlock.registerBehavior(ROCKET_70.get(), new Rocket70.Rocket70DispenseBehavior());
|
||||
DispenserBlock.registerBehavior(MEDIUM_AERIAL_BOMB.get(), new MediumAerialBomb.MediumAerialBombDispenseBehavior());
|
||||
DispenserBlock.registerBehavior(BLU_43_MINE.get(), new Blu43MineItem.Blu43MineDispenseBehavior());
|
||||
DispenserBlock.registerBehavior(ROCKET.get(), new RocketItem.RocketDispenseBehavior());
|
||||
DispenserBlock.registerBehavior(ROCKET_70.get(), new Rocket70Item.Rocket70DispenseBehavior());
|
||||
DispenserBlock.registerBehavior(MEDIUM_AERIAL_BOMB.get(), new MediumAerialBombItem.MediumAerialBombDispenseBehavior());
|
||||
DispenserBlock.registerBehavior(RGO_GRENADE.get(), new RgoGrenade.RgoGrenadeDispenserBehavior());
|
||||
DispenserBlock.registerBehavior(TM_62.get(), new Tm62.Tm62DispenseBehavior());
|
||||
DispenserBlock.registerBehavior(TM_62.get(), new Tm62Item.Tm62DispenseBehavior());
|
||||
}
|
||||
|
||||
public static void register(IEventBus bus) {
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public class ModTabs {
|
|||
output.accept(registryObject.get());
|
||||
|
||||
if (registryObject.get() == ModItems.C4_BOMB.get()) {
|
||||
output.accept(C4Bomb.makeInstance());
|
||||
output.accept(C4BombItem.makeInstance());
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -19,8 +19,9 @@ import org.joml.Math;
|
|||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
public class Blu43Mine extends Item {
|
||||
public Blu43Mine() {
|
||||
public class Blu43MineItem extends Item {
|
||||
|
||||
public Blu43MineItem() {
|
||||
super(new Properties());
|
||||
}
|
||||
|
||||
|
|
@ -28,12 +28,12 @@ import org.jetbrains.annotations.NotNull;
|
|||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import java.util.List;
|
||||
|
||||
public class C4Bomb extends Item {
|
||||
public class C4BombItem extends Item {
|
||||
|
||||
public static final String TAG_CONTROL = "Control";
|
||||
|
||||
public C4Bomb() {
|
||||
super(new Properties());
|
||||
public C4BombItem() {
|
||||
super(new Item.Properties());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -32,10 +32,11 @@ import software.bernie.geckolib.util.GeckoLibUtil;
|
|||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD)
|
||||
public class Tm62 extends Item implements GeoItem {
|
||||
public class Tm62Item extends Item implements GeoItem {
|
||||
|
||||
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
|
||||
|
||||
public Tm62() {
|
||||
public Tm62Item() {
|
||||
super(new Properties().stacksTo(8));
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.atsuishio.superbwarfare.item;
|
||||
package com.atsuishio.superbwarfare.item.common.ammo;
|
||||
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
|
@ -9,8 +9,9 @@ import net.minecraft.world.item.TooltipFlag;
|
|||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import java.util.List;
|
||||
|
||||
public class Agm extends Item {
|
||||
public Agm() {
|
||||
public class AgmItem extends Item {
|
||||
|
||||
public AgmItem() {
|
||||
super(new Properties().stacksTo(2));
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.atsuishio.superbwarfare.item;
|
||||
package com.atsuishio.superbwarfare.item.common.ammo;
|
||||
|
||||
import com.atsuishio.superbwarfare.entity.projectile.Mk82Entity;
|
||||
import com.atsuishio.superbwarfare.init.ModEntities;
|
||||
|
|
@ -22,9 +22,9 @@ import org.jetbrains.annotations.NotNull;
|
|||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import java.util.List;
|
||||
|
||||
public class MediumAerialBomb extends Item implements ProjectileItem {
|
||||
public class MediumAerialBombItem extends Item implements ProjectileItem {
|
||||
|
||||
public MediumAerialBomb() {
|
||||
public MediumAerialBombItem() {
|
||||
super(new Properties().stacksTo(2));
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.atsuishio.superbwarfare.item;
|
||||
package com.atsuishio.superbwarfare.item.common.ammo;
|
||||
|
||||
import com.atsuishio.superbwarfare.entity.projectile.HeliRocketEntity;
|
||||
import com.atsuishio.superbwarfare.init.ModEntities;
|
||||
|
|
@ -18,9 +18,9 @@ import org.jetbrains.annotations.NotNull;
|
|||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
public class Rocket70 extends Item implements ProjectileItem {
|
||||
public class Rocket70Item extends Item implements ProjectileItem {
|
||||
|
||||
public Rocket70() {
|
||||
public Rocket70Item() {
|
||||
super(new Properties());
|
||||
}
|
||||
|
||||
|
|
@ -45,12 +45,13 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
|
||||
@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD)
|
||||
public class Rocket extends Item implements GeoItem, ProjectileItem {
|
||||
public class RocketItem extends Item implements GeoItem, ProjectileItem {
|
||||
|
||||
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
|
||||
public static ItemDisplayContext transformType;
|
||||
|
||||
public Rocket() {
|
||||
super(new Properties().stacksTo(16));
|
||||
public RocketItem() {
|
||||
super(new Item.Properties().stacksTo(16));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.atsuishio.superbwarfare.item;
|
||||
package com.atsuishio.superbwarfare.item.common.ammo;
|
||||
|
||||
import com.atsuishio.superbwarfare.entity.projectile.SwarmDroneEntity;
|
||||
import com.atsuishio.superbwarfare.init.ModItems;
|
||||
|
|
@ -25,9 +25,9 @@ import org.jetbrains.annotations.NotNull;
|
|||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import java.util.List;
|
||||
|
||||
public class SwarmDrone extends Item implements ProjectileItem {
|
||||
public class SwarmDroneItem extends Item implements ProjectileItem {
|
||||
|
||||
public SwarmDrone() {
|
||||
public SwarmDroneItem() {
|
||||
super(new Properties());
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.atsuishio.superbwarfare.item;
|
||||
package com.atsuishio.superbwarfare.item.common.ammo;
|
||||
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
|
@ -9,8 +9,9 @@ import net.minecraft.world.item.TooltipFlag;
|
|||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import java.util.List;
|
||||
|
||||
public class WireGuideMissile extends Item {
|
||||
public WireGuideMissile() {
|
||||
public class WireGuideMissileItem extends Item {
|
||||
|
||||
public WireGuideMissileItem() {
|
||||
super(new Properties().stacksTo(4));
|
||||
}
|
||||
|
||||
Loading…
Add table
Reference in a new issue