PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 23:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some items not appearing, or appearing in the incorrect creative tab

Browse source
This commit is contained in:
Sollace 2020-04-25 22:22:28 +02:00
parent bf3e9419c7
commit 17e036a49c
13 changed files with 60 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java
View file

@ -56,8 +56,8 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
UUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150")
};
public AlicornAmuletItem() {
super(new Material(), EquipmentSlot.CHEST, new Settings().maxCount(1));
public AlicornAmuletItem(Settings settings) {
super(new Material(), EquipmentSlot.CHEST, settings);
}
@Override

8
src/main/java/com/minelittlepony/unicopia/item/AppleItem.java
View file

@ -9,9 +9,7 @@ import com.minelittlepony.unicopia.toxin.Toxicity;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.ItemEntity;
import net.minecraft.item.FoodComponent;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.particle.ParticleTypes;
import net.minecraft.text.Text;
@ -21,10 +19,8 @@ import net.minecraft.world.World;
public class AppleItem extends Item implements ItemEntityCapabilities.TickableItem {
public AppleItem(FoodComponent components) {
super(new Item.Settings()
.group(ItemGroup.FOOD)
.food(components));
public AppleItem(Settings settings) {
super(settings);
}
@Override

5
src/main/java/com/minelittlepony/unicopia/item/BagOfHoldingItem.java
View file

@ -23,7 +23,6 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.Inventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.sound.SoundEvents;
import net.minecraft.text.Text;
@ -39,8 +38,8 @@ import net.minecraft.world.World;
public class BagOfHoldingItem extends Item implements MagicalItem {
public BagOfHoldingItem() {
super(new Settings().maxCount(1).group(ItemGroup.TRANSPORTATION));
public BagOfHoldingItem(Settings settings) {
super(settings);
}
@Override

4
src/main/java/com/minelittlepony/unicopia/item/CursedMagicGemItem.java
View file

@ -15,6 +15,10 @@ import net.minecraft.world.explosion.Explosion.DestructionType;
public class CursedMagicGemItem extends MagicGemItem {
public CursedMagicGemItem(Settings settings) {
super(settings);
}
@Override
public CastResult onDispenseSpell(BlockPointer source, ItemStack stack, DispenceableMagicEffect effect) {

6
src/main/java/com/minelittlepony/unicopia/item/ExtendedShearsItem.java
View file

@ -8,8 +8,6 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.DispenserBlock;
import net.minecraft.block.dispenser.DispenserBehavior;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.item.Items;
@ -21,8 +19,8 @@ import net.minecraft.world.World;
public class ExtendedShearsItem extends ShearsItem {
public ExtendedShearsItem() {
super(new Item.Settings().maxDamage(238).group(ItemGroup.TOOLS));
public ExtendedShearsItem(Settings settings) {
super(settings);
final Optional<DispenserBehavior> vanillaDispenserBehaviour = Dispensable.getBehavior(new ItemStack(Items.SHEARS));
DispenserBlock.registerBehavior(Items.SHEARS, Dispensable.setDispenseable(this, (source, stack) -> {

6
src/main/java/com/minelittlepony/unicopia/item/MagicGemItem.java
View file

@ -37,10 +37,8 @@ import net.minecraft.world.World;
public class MagicGemItem extends Item implements Castable {
public MagicGemItem() {
super(new Settings()
.maxCount(16)
.group(ItemGroup.BREWING));
public MagicGemItem(Settings settings) {
super(settings);
Dispensable.setDispenseable(this, this::dispenseStack);
}

5
src/main/java/com/minelittlepony/unicopia/item/RottenAppleItem.java
View file

@ -3,13 +3,12 @@ package com.minelittlepony.unicopia.item;
import com.minelittlepony.unicopia.ducks.IItemEntity;
import net.fabricmc.fabric.api.registry.FuelRegistry;
import net.minecraft.item.FoodComponent;
import net.minecraft.util.ActionResult;
public class RottenAppleItem extends AppleItem {
public RottenAppleItem(FoodComponent components) {
super(components);
public RottenAppleItem(Settings settings) {
super(settings);
FuelRegistry.INSTANCE.add(this, 150);
}

8
src/main/java/com/minelittlepony/unicopia/item/SpellbookItem.java
View file

@ -10,8 +10,6 @@ import com.minelittlepony.unicopia.magic.Dispensable;
import net.minecraft.block.DispenserBlock;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BookItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.util.ActionResult;
import net.minecraft.util.TypedActionResult;
@ -21,10 +19,8 @@ import net.minecraft.world.World;
public class SpellbookItem extends BookItem {
public SpellbookItem() {
super(new Item.Settings()
.maxCount(1)
.group(ItemGroup.BREWING));
public SpellbookItem(Settings settings) {
super(settings);
Dispensable.setDispenseable(this, (source, stack) -> {
Direction facing = source.getBlockState().get(DispenserBlock.FACING);
BlockPos pos = source.getBlockPos().offset(facing);

5
src/main/java/com/minelittlepony/unicopia/item/StickItem.java
View file

@ -7,7 +7,6 @@ import com.minelittlepony.unicopia.block.UBlocks;
import net.minecraft.advancement.criterion.Criterions;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.server.network.ServerPlayerEntity;
@ -19,8 +18,8 @@ import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
public class StickItem extends Item {
public StickItem() {
super(new Item.Settings().group(ItemGroup.MATERIALS));
public StickItem(Settings settings) {
super(settings);
}
@Override

5
src/main/java/com/minelittlepony/unicopia/item/UFoodComponents.java
View file

@ -19,6 +19,11 @@ public interface UFoodComponents {
FoodComponent BURNED_JUICE = builder(3, 1).build();
FoodComponent WORMS = builder(1, 0).alwaysEdible().build();
FoodComponent CEREAL = builder(9, 0.8F).build();
FoodComponent SUGAR = builder(20, -2).build();
FoodComponent ZAP_APPLE = builder(4, 0.3F).alwaysEdible().snack().build();
static FoodComponent.Builder builder(int hunger, float saturation) {
return new FoodComponent.Builder()
.hunger(hunger)

67
src/main/java/com/minelittlepony/unicopia/item/UItems.java
View file

@ -16,7 +16,6 @@ import net.minecraft.item.Item.Settings;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.AliasedBlockItem;
import net.minecraft.item.BlockItem;
import net.minecraft.item.FoodComponent;
import net.minecraft.item.FoodComponents;
import net.minecraft.item.Items;
import net.minecraft.item.MusicDiscItem;
@ -30,14 +29,14 @@ import net.minecraft.util.registry.Registry;
public interface UItems {
AppleItem GREEN_APPLE = register(new AppleItem(FoodComponents.APPLE), "apple_green");
AppleItem SWEET_APPLE = register(new AppleItem(FoodComponents.APPLE), "apple_sweet");
AppleItem SOUR_APPLE = register(new AppleItem(FoodComponents.APPLE), "apple_sour");
AppleItem GREEN_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "apple_green");
AppleItem SWEET_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "apple_sweet");
AppleItem SOUR_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "apple_sour");
ZapAppleItem ZAP_APPLE = register(new ZapAppleItem(), "zap_apple");
ZapAppleItem ZAP_APPLE = register(new ZapAppleItem(new Item.Settings().group(ItemGroup.FOOD).food(UFoodComponents.ZAP_APPLE)), "zap_apple");
AppleItem ROTTEN_APPLE = register(new RottenAppleItem(FoodComponents.APPLE), "rotten_apple");
AppleItem COOKED_ZAP_APPLE = register(new AppleItem(FoodComponents.APPLE), "cooked_zap_apple");
AppleItem ROTTEN_APPLE = register(new RottenAppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "rotten_apple");
AppleItem COOKED_ZAP_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "cooked_zap_apple");
Item CLOUD_MATTER = register(new Item(new Settings().group(ItemGroup.MATERIALS)), "cloud_matter");
Item DEW_DROP = register(new Item(new Settings().group(ItemGroup.MATERIALS)), "dew_drop");
@ -79,45 +78,33 @@ public interface UItems {
Item ENCHANTED_CLOUD_SLAB = register(new PredicatedBlockItem(UBlocks.ENCHANTED_CLOUD_SLAB, new Settings().group(ItemGroup.BUILDING_BLOCKS), INTERACT_WITH_CLOUDS), "enchanted_cloud_slab");
Item DENSE_CLOUD_SLAB = register(new PredicatedBlockItem(UBlocks.DENSE_CLOUD_SLAB, new Settings().group(ItemGroup.BUILDING_BLOCKS), INTERACT_WITH_CLOUDS), "dense_cloud_slab");
MagicGemItem GEM = register(new MagicGemItem(), "gem");
MagicGemItem CORRUPTED_GEM = register(new CursedMagicGemItem(), "corrupted_gem");
MagicGemItem GEM = register(new MagicGemItem(new Settings().maxCount(16).group(ItemGroup.BREWING)), "gem");
MagicGemItem CORRUPTED_GEM = register(new CursedMagicGemItem(new Settings().maxCount(16).group(ItemGroup.BREWING)), "corrupted_gem");
BagOfHoldingItem BAG_OF_HOLDING = register(new BagOfHoldingItem(), "bag_of_holding");
AlicornAmuletItem ALICORN_AMULET = register(new AlicornAmuletItem(), "alicorn_amulet");
BagOfHoldingItem BAG_OF_HOLDING = register(new BagOfHoldingItem(new Settings().group(ItemGroup.TRANSPORTATION).rarity(Rarity.UNCOMMON).maxCount(1)), "bag_of_holding");
AlicornAmuletItem ALICORN_AMULET = register(new AlicornAmuletItem(new Settings().group(ItemGroup.COMBAT).rarity(Rarity.RARE).maxCount(1)), "alicorn_amulet");
SpellbookItem SPELLBOOK = register(new SpellbookItem(), "spellbook");
Item STAFF_MEADOW_BROOK = register(new StaffItem(new Settings().maxCount(1).maxDamage(2)), "staff_meadow_brook");
Item STAFF_REMEMBERANCE = register(new EnchantedStaffItem(new Settings(), new ScorchSpell()), "staff_remembrance");
SpellbookItem SPELLBOOK = register(new SpellbookItem(new Item.Settings().maxCount(1).group(ItemGroup.BREWING)), "spellbook");
Item STAFF_MEADOW_BROOK = register(new StaffItem(new Settings().group(ItemGroup.TOOLS).rarity(Rarity.UNCOMMON).maxCount(1).maxDamage(2)), "staff_meadow_brook");
Item STAFF_REMEMBERANCE = register(new EnchantedStaffItem(new Settings().group(ItemGroup.TOOLS).rarity(Rarity.UNCOMMON).maxCount(1), new ScorchSpell()), "staff_remembrance");
Item SPEAR = register(new SpearItem(new Settings().maxCount(1).maxDamage(500)), "spear");
Item SPEAR = register(new SpearItem(new Settings().group(ItemGroup.TOOLS).maxCount(1).maxDamage(500)), "spear");
MossItem MOSS = register(new MossItem(new Settings()
.food(UFoodComponents.RANDOM_FOLIAGE)), "moss");
MossItem MOSS = register(new MossItem(new Settings().group(ItemGroup.FOOD).food(UFoodComponents.RANDOM_FOLIAGE)), "moss");
Item ALFALFA_SEEDS = register(new AliasedBlockItem(UBlocks.ALFALFA_CROPS, new Settings()
.group(ItemGroup.MATERIALS)
.food(UFoodComponents.ALFALFA_SEEDS)), "alfalfa_seeds");
Item ALFALFA_LEAVES = register(new Item(new Settings()
.group(ItemGroup.FOOD)
.food(UFoodComponents.ALFALFA_LEAVES)), "alfalfa_leaves");
Item ALFALFA_SEEDS = register(new AliasedBlockItem(UBlocks.ALFALFA_CROPS, new Settings().group(ItemGroup.MATERIALS).food(UFoodComponents.ALFALFA_SEEDS)), "alfalfa_seeds");
Item ALFALFA_LEAVES = register(new Item(new Settings().group(ItemGroup.FOOD).food(UFoodComponents.ALFALFA_LEAVES)), "alfalfa_leaves");
Item ENCHANTED_TORCH = register(new BlockItem(UBlocks.ENCHANTED_TORCH, new Settings().group(ItemGroup.DECORATIONS)), "enchanted_torch");
Item CEREAL = register(new SugaryItem(new Settings()
.group(ItemGroup.FOOD)
.food(new FoodComponent.Builder()
.hunger(9)
.saturationModifier(0.8F)
.build())
.food(UFoodComponents.CEREAL)
.maxCount(1)
.recipeRemainder(Items.BOWL), 1), "cereal");
Item SUGAR_CEREAL = register(new SugaryItem(new Settings()
.group(ItemGroup.FOOD)
.food(new FoodComponent.Builder()
.hunger(20)
.saturationModifier(-2)
.build())
.food(UFoodComponents.SUGAR)
.maxCount(1)
.recipeRemainder(Items.BOWL), 110), "sugar_cereal");
@ -130,35 +117,45 @@ public interface UItems {
.food(UFoodComponents.BAD_TOMATO)), "rotten_tomato");
TomatoItem CLOUDSDALE_TOMATO = register(new TomatoItem(new Settings()
.rarity(Rarity.UNCOMMON)
.group(ItemGroup.FOOD)
.food(UFoodComponents.GOOD_TOMATO)), "cloudsdale_tomato");
RottenTomatoItem ROTTEN_CLOUDSDALE_TOMATO = register(new RottenTomatoItem(new Settings()
.group(ItemGroup.FOOD)
.rarity(Rarity.UNCOMMON)
.food(UFoodComponents.BAD_TOMATO)), "rotten_cloudsdale_tomato");
Item APPLE_SEEDS = register(new BlockItem(UBlocks.APPLE_SAPLING, new Settings().group(ItemGroup.DECORATIONS)), "apple_seeds");
Item APPLE_LEAVES = register(new BlockItem(UBlocks.APPLE_LEAVES, new Settings().group(ItemGroup.DECORATIONS)), "apple_leaves");
Item DAFFODIL_DAISY_SANDWICH = register(new ToxicItem(new Settings()
.group(ItemGroup.FOOD)
.food(UFoodComponents.DAFODIL_DAISY_SANDWICH), UseAction.EAT, Toxicity::fromStack, Toxin.FOOD), "daffodil_daisy_sandwich");
Item HAY_BURGER = register(new ToxicItem(new Settings()
.group(ItemGroup.FOOD)
.food(UFoodComponents.HAY_BURGER), UseAction.EAT, Toxicity::fromStack, Toxin.FOOD), "hay_burger");
Item HAY_FRIES = register(new ToxicItem(new Settings()
.group(ItemGroup.FOOD)
.food(UFoodComponents.HAY_FRIES), UseAction.EAT, Toxicity.SAFE, Toxin.FOOD), "hay_fries");
Item SALAD = register(new ToxicItem(new Settings()
.group(ItemGroup.FOOD)
.food(UFoodComponents.SALAD)
.recipeRemainder(Items.BOWL), UseAction.EAT, Toxicity::fromStack, Toxin.FOOD), "salad");
Item WHEAT_WORMS = register(new ToxicItem(new Settings()
.group(ItemGroup.MISC)
.food(UFoodComponents.WORMS), UseAction.EAT, Toxicity.SEVERE, Toxin.FOOD), "wheat_worms");
Item MUG = register(new Item(new Settings().group(ItemGroup.MATERIALS)), "mug");
Item CIDER = register(new ToxicItem(new Settings()
.group(ItemGroup.FOOD)
.food(UFoodComponents.SALAD)
.recipeRemainder(MUG), UseAction.DRINK, Toxicity.MILD, Toxin.FOOD), "apple_cider");
Item JUICE = register(new ToxicItem(new Settings()
.group(ItemGroup.FOOD)
.recipeRemainder(Items.GLASS_BOTTLE)
.food(UFoodComponents.JUICE), UseAction.DRINK, Toxicity.SAFE, Toxin.FOOD), "juice");
Item BURNED_JUICE = register(new ToxicItem(new Settings()
.group(ItemGroup.FOOD)
.recipeRemainder(Items.GLASS_BOTTLE)
.food(UFoodComponents.BURNED_JUICE), UseAction.DRINK, Toxicity.FAIR, Toxin.FOOD), "burned_juice");
@ -186,10 +183,10 @@ public interface UItems {
}
interface VanillaOverrides {
StickItem STICK = register(new StickItem(), Items.STICK);
ExtendedShearsItem SHEARS = register(new ExtendedShearsItem(), Items.SHEARS);
StickItem STICK = register(new StickItem(new Item.Settings().group(ItemGroup.MATERIALS)), Items.STICK);
ExtendedShearsItem SHEARS = register(new ExtendedShearsItem(new Item.Settings().maxDamage(238).group(ItemGroup.TOOLS)), Items.SHEARS);
AppleItem APPLE = register(new AppleItem(FoodComponents.APPLE), Items.APPLE);
AppleItem APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), Items.APPLE);
static <T extends Item> T register(T newItem, Item oldItem) {
return Registry.ITEM.set(Registry.ITEM.getRawId(oldItem), Registry.ITEM.getId(oldItem), newItem);

8
src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java
View file

@ -15,7 +15,6 @@ import net.minecraft.entity.mob.CreeperEntity;
import net.minecraft.entity.passive.PigEntity;
import net.minecraft.entity.passive.VillagerEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.FoodComponent;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
@ -43,11 +42,8 @@ public class ZapAppleItem extends AppleItem {
UItems.COOKED_ZAP_APPLE
);
public ZapAppleItem() {
super(new FoodComponent.Builder()
.hunger(4)
.saturationModifier(0.3F)
.alwaysEdible().build());
public ZapAppleItem(Settings settings) {
super(settings);
}
@Override

3
src/main/java/com/minelittlepony/unicopia/toxin/ToxicItem.java
View file

@ -9,7 +9,6 @@ import net.minecraft.client.item.TooltipContext;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.util.Hand;
@ -26,7 +25,7 @@ public class ToxicItem extends Item {
}
public ToxicItem(Item.Settings settings, UseAction action, Function<ItemStack, Toxicity> toxicity, Toxin toxin) {
super(settings.group(ItemGroup.FOOD));
super(settings);
this.toxic = new Toxic(this, action, toxin, toxicity);
}