mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Flatten viruses
This commit is contained in:
1 parent
ae5ca7d44c
commit
a0182a7bf8
20 files changed
+45
-69
No files matched your search
@@ -113,7 +113,8 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addItem(ModItems.diviningRod);
|
||||
addItem(ModItems.gravityRod);
|
||||
addItem(ModItems.missileRod);
|
||||
addItem(ModItems.virus);
|
||||
addItem(ModItems.necroVirus);
|
||||
addItem(ModItems.nullVirus);
|
||||
addItem(ModItems.slingshot);
|
||||
addItem(ModItems.vineBall);
|
||||
addItem(ModItems.keepIvy);
|
||||
|
||||
@@ -558,8 +558,8 @@ public final class ModCraftingRecipes {
|
||||
recipeSlingshot = ModItems.slingshot.getRegistryName();
|
||||
recipeLaputaShard = path("laputashard_0");
|
||||
recipesLaputaShardUpgrade = allOfGroup("laputashard_upgrade");
|
||||
recipeVirusZombie = path("virus_0");
|
||||
recipeVirusSkeleton = path("virus_1");
|
||||
recipeVirusZombie = ModItems.necroVirus.getRegistryName();
|
||||
recipeVirusSkeleton = ModItems.nullVirus.getRegistryName();
|
||||
recipeSkyDirtRod = ModItems.skyDirtRod.getRegistryName();
|
||||
recipeGlassPick = ModItems.glassPick.getRegistryName();
|
||||
recipeDiviningRod = ModItems.diviningRod.getRegistryName();
|
||||
|
||||
@@ -57,6 +57,13 @@ public class FlattenItems implements IFixableData {
|
||||
EnumDyeColor color = EnumDyeColor.byMetadata(i);
|
||||
return LibMisc.MOD_ID + ":" + LibItemNames.PETAL + "_" + color.getName();
|
||||
});
|
||||
LOOKUP.put("botania:virus", i -> {
|
||||
if (i == 1) {
|
||||
return LibMisc.MOD_ID + ":" + LibItemNames.NULL_VIRUS;
|
||||
} else {
|
||||
return LibMisc.MOD_ID + ":" + LibItemNames.NECRO_VIRUS;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
package vazkii.botania.common.item;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.SharedMonsterAttributes;
|
||||
import net.minecraft.entity.ai.attributes.AbstractAttributeMap;
|
||||
@@ -28,30 +27,18 @@ import net.minecraft.init.SoundEvents;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingHurtEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.ReflectionHelper;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.CapabilityItemHandler;
|
||||
import net.minecraftforge.items.IItemHandler;
|
||||
import vazkii.botania.client.core.handler.ModelHandler;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibObfuscation;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
|
||||
public class ItemVirus extends ItemMod {
|
||||
|
||||
private static final int SUBTYPES = 2;
|
||||
|
||||
public ItemVirus() {
|
||||
super(LibItemNames.VIRUS);
|
||||
setHasSubtypes(true);
|
||||
MinecraftForge.EVENT_BUS.register(ItemVirus.class);
|
||||
public ItemVirus(String name) {
|
||||
super(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -79,7 +66,7 @@ public class ItemVirus extends ItemMod {
|
||||
|
||||
horse.setDead();
|
||||
|
||||
AbstractHorse newHorse = stack.getItemDamage() == 0 ? new EntityZombieHorse(player.world) : new EntitySkeletonHorse(player.world);
|
||||
AbstractHorse newHorse = stack.getItem() == ModItems.necroVirus ? new EntityZombieHorse(player.world) : new EntitySkeletonHorse(player.world);
|
||||
newHorse.setTamedBy(player);
|
||||
newHorse.setPositionAndRotation(horse.posX, horse.posY, horse.posZ, horse.rotationYaw, horse.rotationPitch);
|
||||
|
||||
@@ -123,24 +110,4 @@ public class ItemVirus extends ItemMod {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> list) {
|
||||
if(isInCreativeTab(tab)) {
|
||||
for(int i = 0; i < SUBTYPES; i++)
|
||||
list.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack stack) {
|
||||
return super.getUnlocalizedName(stack) + stack.getItemDamage();
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.VIRUS);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -238,7 +238,8 @@ public final class ModItems {
|
||||
public static final Item slingshot = new ItemSlingshot();
|
||||
public static final Item manaBottle = new ItemBottledMana();
|
||||
public static final Item laputaShard = new ItemLaputaShard();
|
||||
public static final Item virus = new ItemVirus();
|
||||
public static final Item necroVirus = new ItemVirus(LibItemNames.NECRO_VIRUS);
|
||||
public static final Item nullVirus = new ItemVirus(LibItemNames.NULL_VIRUS);
|
||||
public static final Item reachRing = new ItemReachRing();
|
||||
public static final Item skyDirtRod = new ItemSkyDirtRod();
|
||||
public static final Item itemFinder = new ItemItemFinder();
|
||||
@@ -450,7 +451,8 @@ public final class ModItems {
|
||||
r.register(slingshot);
|
||||
r.register(manaBottle);
|
||||
r.register(laputaShard);
|
||||
r.register(virus);
|
||||
r.register(necroVirus);
|
||||
r.register(nullVirus);
|
||||
r.register(reachRing);
|
||||
r.register(skyDirtRod);
|
||||
r.register(itemFinder);
|
||||
|
||||
@@ -89,7 +89,8 @@ public final class LibItemNames {
|
||||
public static final String SLINGSHOT = "slingshot";
|
||||
public static final String MANA_BOTTLE = "manaBottle";
|
||||
public static final String LAPUTA_SHARD = "laputaShard";
|
||||
public static final String VIRUS = "virus";
|
||||
public static final String NECRO_VIRUS = "virus_necrodermal";
|
||||
public static final String NULL_VIRUS = "virus_nullodermal";
|
||||
public static final String REACH_RING = "reachRing";
|
||||
public static final String SKY_DIRT_ROD = "skyDirtRod";
|
||||
public static final String MANASTEEL_HELM_R = "manasteelHelmReveal";
|
||||
|
||||
Reference in new issue
Block a user