MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Item classes rename

Browse source
This commit is contained in:
paulevsGitch 2021-01-05 04:04:23 +03:00
parent 5f3547de8e
commit b53e76ce7b
15 changed files with 57 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ru/betterend/BetterEnd.java
View file

@ -9,7 +9,7 @@ import ru.betterend.config.Configs;
import ru.betterend.effects.EndEnchantments;
import ru.betterend.effects.EndPotions;
import ru.betterend.integration.Integrations;
import ru.betterend.item.GuideBook;
import ru.betterend.item.GuideBookItem;
import ru.betterend.recipe.AlloyingRecipes;
import ru.betterend.recipe.CraftingRecipes;
import ru.betterend.recipe.FurnaceRecipes;
@ -60,7 +60,7 @@ public class BetterEnd implements ModInitializer {
GeneratorOptions.init();
if (hasGuideBook()) {
GuideBook.register();
GuideBookItem.register();
}
FabricLoader.getInstance().getEntrypoints("betterend", BetterEndPlugin.class).forEach(BetterEndPlugin::register);

4
src/main/java/ru/betterend/item/ItemDrink.java → src/main/java/ru/betterend/item/DrinkItem.java
View file

@ -8,8 +8,8 @@ import net.minecraft.util.TypedActionResult;
import net.minecraft.util.UseAction;
import net.minecraft.world.World;
public class ItemDrink extends PatternedItem {
public ItemDrink(Settings settings) {
public class DrinkItem extends PatternedItem {
public DrinkItem(Settings settings) {
super(settings);
}

5
src/main/java/ru/betterend/item/EnchantedPetal.java → src/main/java/ru/betterend/item/EnchantedPetalItem.java
View file

@ -5,9 +5,8 @@ import net.minecraft.util.Rarity;
import ru.betterend.patterns.Patterns;
import ru.betterend.registry.EndItems;
public class EnchantedPetal extends PatternedItem {
public EnchantedPetal() {
public class EnchantedPetalItem extends PatternedItem {
public EnchantedPetalItem() {
super(EndItems.makeItemSettings().rarity(Rarity.RARE).maxCount(16));
}

5
src/main/java/ru/betterend/item/EndAxe.java → src/main/java/ru/betterend/item/EndAxeItem.java
View file

@ -12,9 +12,8 @@ import net.minecraft.tag.Tag;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
public class EndAxe extends AxeItem implements DynamicAttributeTool, Patterned {
public EndAxe(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
public class EndAxeItem extends AxeItem implements DynamicAttributeTool, Patterned {
public EndAxeItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
super(material, attackDamage, attackSpeed, settings);
}

5
src/main/java/ru/betterend/item/EndHammer.java → src/main/java/ru/betterend/item/EndHammerItem.java
View file

@ -30,13 +30,12 @@ import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
import ru.betterend.registry.EndTags;
public class EndHammer extends MiningToolItem implements DynamicAttributeTool, Patterned {
public class EndHammerItem extends MiningToolItem implements DynamicAttributeTool, Patterned {
public final static UUID ATTACK_KNOCKBACK_MODIFIER_ID = MathHelper.randomUuid(ThreadLocalRandom.current());
private final Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers;
public EndHammer(ToolMaterial material, float attackDamage, float attackSpeed, double knockback, Settings settings) {
public EndHammerItem(ToolMaterial material, float attackDamage, float attackSpeed, double knockback, Settings settings) {
super(attackDamage, attackSpeed, material, Sets.newHashSet(), settings);
Builder<EntityAttribute, EntityAttributeModifier> builder = ImmutableMultimap.builder();

5
src/main/java/ru/betterend/item/EndHoe.java → src/main/java/ru/betterend/item/EndHoeItem.java
View file

@ -5,9 +5,8 @@ import net.minecraft.item.ToolMaterial;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
public class EndHoe extends HoeItem implements Patterned {
public EndHoe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
public class EndHoeItem extends HoeItem implements Patterned {
public EndHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
super(material, attackDamage, attackSpeed, settings);
}

5
src/main/java/ru/betterend/item/EndPickaxe.java → src/main/java/ru/betterend/item/EndPickaxeItem.java
View file

@ -12,9 +12,8 @@ import net.minecraft.tag.Tag;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
public class EndPickaxe extends PickaxeItem implements DynamicAttributeTool, Patterned {
public EndPickaxe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
public class EndPickaxeItem extends PickaxeItem implements DynamicAttributeTool, Patterned {
public EndPickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
super(material, attackDamage, attackSpeed, settings);
}

4
src/main/java/ru/betterend/item/ItemSpawnEgg.java → src/main/java/ru/betterend/item/EndSpawnEggItem.java
View file

@ -5,8 +5,8 @@ import net.minecraft.item.SpawnEggItem;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
public class ItemSpawnEgg extends SpawnEggItem implements Patterned {
public ItemSpawnEgg(EntityType<?> type, int primaryColor, int secondaryColor, Settings settings) {
public class EndSpawnEggItem extends SpawnEggItem implements Patterned {
public EndSpawnEggItem(EntityType<?> type, int primaryColor, int secondaryColor, Settings settings) {
super(type, primaryColor, secondaryColor, settings);
}

5
src/main/java/ru/betterend/item/EternalCrystal.java → src/main/java/ru/betterend/item/EternalCrystalItem.java
View file

@ -3,9 +3,8 @@ package ru.betterend.item;
import net.minecraft.util.Rarity;
import ru.betterend.registry.EndItems;
public class EternalCrystal extends PatternedItem {
public EternalCrystal() {
public class EternalCrystalItem extends PatternedItem {
public EternalCrystalItem() {
super(EndItems.makeItemSettings().maxCount(16).rarity(Rarity.EPIC));
}
}

7
src/main/java/ru/betterend/item/GuideBook.java → src/main/java/ru/betterend/item/GuideBookItem.java
View file

@ -18,14 +18,13 @@ import ru.betterend.registry.EndItems;
import ru.betterend.util.LangUtil;
import vazkii.patchouli.api.PatchouliAPI;
public class GuideBook extends PatternedItem {
public class GuideBookItem extends PatternedItem {
public final static Identifier BOOK_ID = BetterEnd.makeID("guidebook");
public static final Item GUIDE_BOOK = EndItems.registerItem(BOOK_ID, new GuideBook());
public static final Item GUIDE_BOOK = EndItems.registerItem(BOOK_ID, new GuideBookItem());
public static void register() {}
public GuideBook() {
public GuideBookItem() {
super(EndItems.makeItemSettings().maxCount(1));
}

2
src/main/java/ru/betterend/item/EndArmorMaterial.java → src/main/java/ru/betterend/item/material/EndArmorMaterial.java
View file

@ -1,4 +1,4 @@
package ru.betterend.item;
package ru.betterend.item.material;
import java.util.function.Supplier;

2
src/main/java/ru/betterend/item/EndToolMaterial.java → src/main/java/ru/betterend/item/material/EndToolMaterial.java
View file

@ -1,4 +1,4 @@
package ru.betterend.item;
package ru.betterend.item.material;
import java.util.function.Supplier;

4
src/main/java/ru/betterend/mixin/common/AbstractBlockMixin.java
View file

@ -19,7 +19,7 @@ import net.minecraft.item.Items;
import net.minecraft.loot.context.LootContext;
import net.minecraft.loot.context.LootContextParameters;
import net.minecraft.util.math.MathHelper;
import ru.betterend.item.EndHammer;
import ru.betterend.item.EndHammerItem;
import ru.betterend.util.MHelper;
@Mixin(AbstractBlock.class)
@ -29,7 +29,7 @@ public abstract class AbstractBlockMixin {
public void getDroppedStacks(BlockState state, LootContext.Builder builder, CallbackInfoReturnable<List<ItemStack>> info) {
if (state.isOf(Blocks.GLOWSTONE)) {
ItemStack tool = builder.get(LootContextParameters.TOOL);
if (tool != null && tool.getItem() instanceof EndHammer) {
if (tool != null && tool.getItem() instanceof EndHammerItem) {
int min = 3;
int max = 4;
int count = 0;

4
src/main/java/ru/betterend/recipe/CraftingRecipes.java
View file

@ -8,7 +8,7 @@ import net.minecraft.item.Items;
import net.minecraft.potion.PotionUtil;
import net.minecraft.potion.Potions;
import ru.betterend.BetterEnd;
import ru.betterend.item.GuideBook;
import ru.betterend.item.GuideBookItem;
import ru.betterend.recipe.builders.GridRecipe;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndItems;
@ -142,7 +142,7 @@ public class CraftingRecipes {
.build();
if (BetterEnd.hasGuideBook()) {
GridRecipe.make("guide_book", GuideBook.GUIDE_BOOK)
GridRecipe.make("guide_book", GuideBookItem.GUIDE_BOOK)
.setShape("D", "B", "C")
.addMaterial('D', EndItems.ENDER_DUST)
.addMaterial('B', Items.BOOK)

60
src/main/java/ru/betterend/registry/EndItems.java
View file

@ -34,17 +34,17 @@ import net.minecraft.util.math.Direction;
import net.minecraft.util.registry.Registry;
import ru.betterend.BetterEnd;
import ru.betterend.config.Configs;
import ru.betterend.item.EnchantedPetal;
import ru.betterend.item.EndArmorMaterial;
import ru.betterend.item.EndAxe;
import ru.betterend.item.EndHammer;
import ru.betterend.item.EndHoe;
import ru.betterend.item.EndPickaxe;
import ru.betterend.item.EndToolMaterial;
import ru.betterend.item.EternalCrystal;
import ru.betterend.item.ItemDrink;
import ru.betterend.item.ItemSpawnEgg;
import ru.betterend.item.EnchantedPetalItem;
import ru.betterend.item.EndAxeItem;
import ru.betterend.item.EndHammerItem;
import ru.betterend.item.EndHoeItem;
import ru.betterend.item.EndPickaxeItem;
import ru.betterend.item.EternalCrystalItem;
import ru.betterend.item.DrinkItem;
import ru.betterend.item.EndSpawnEggItem;
import ru.betterend.item.PatternedItem;
import ru.betterend.item.material.EndArmorMaterial;
import ru.betterend.item.material.EndToolMaterial;
import ru.betterend.tab.CreativeTabs;
import ru.betterend.util.TagHelper;
@ -66,8 +66,8 @@ public class EndItems {
public final static Item CRYSTALLINE_SULPHUR = registerItem("crystalline_sulphur");
public final static Item HYDRALUX_PETAL = registerItem("hydralux_petal");
public final static Item GELATINE = registerItem("gelatine");
public static final Item ETERNAL_CRYSTAL = registerItem("eternal_crystal", new EternalCrystal());
public final static Item ENCHANTED_PETAL = registerItem("enchanted_petal", new EnchantedPetal());
public static final Item ETERNAL_CRYSTAL = registerItem("eternal_crystal", new EternalCrystalItem());
public final static Item ENCHANTED_PETAL = registerItem("enchanted_petal", new EnchantedPetalItem());
public final static Item LEATHER_STRIPE = registerItem("leather_stripe");
public final static Item LEATHER_WRAPPED_STICK = registerItem("leather_wrapped_stick");
@ -88,20 +88,20 @@ public class EndItems {
// Tools //
public static final ToolItem TERMINITE_SHOVEL = registerTool("terminite_shovel", new ShovelItem(EndToolMaterial.TERMINITE, 1.5F, -3.0F, makeItemSettings()));
public static final ToolItem TERMINITE_SWORD = registerTool("terminite_sword", new SwordItem(EndToolMaterial.TERMINITE, 3, -2.4F, makeItemSettings()));
public static final ToolItem TERMINITE_PICKAXE = registerTool("terminite_pickaxe", new EndPickaxe(EndToolMaterial.TERMINITE, 1, -2.8F, makeItemSettings()));
public static final ToolItem TERMINITE_AXE = registerTool("terminite_axe", new EndAxe(EndToolMaterial.TERMINITE, 6.0F, -3.0F, makeItemSettings()));
public static final ToolItem TERMINITE_HOE = registerTool("terminite_hoe", new EndHoe(EndToolMaterial.TERMINITE, -3, 0.0F, makeItemSettings()));
public static final ToolItem TERMINITE_HAMMER = registerTool("terminite_hammer", new EndHammer(EndToolMaterial.TERMINITE, 5.0F, -3.2F, 0.3D, makeItemSettings()));
public static final ToolItem TERMINITE_PICKAXE = registerTool("terminite_pickaxe", new EndPickaxeItem(EndToolMaterial.TERMINITE, 1, -2.8F, makeItemSettings()));
public static final ToolItem TERMINITE_AXE = registerTool("terminite_axe", new EndAxeItem(EndToolMaterial.TERMINITE, 6.0F, -3.0F, makeItemSettings()));
public static final ToolItem TERMINITE_HOE = registerTool("terminite_hoe", new EndHoeItem(EndToolMaterial.TERMINITE, -3, 0.0F, makeItemSettings()));
public static final ToolItem TERMINITE_HAMMER = registerTool("terminite_hammer", new EndHammerItem(EndToolMaterial.TERMINITE, 5.0F, -3.2F, 0.3D, makeItemSettings()));
public static final ToolItem AETERNIUM_SHOVEL = registerTool("aeternium_shovel", new ShovelItem(EndToolMaterial.AETERNIUM, 1.5F, -3.0F, makeItemSettings()));
public static final ToolItem AETERNIUM_SWORD = registerTool("aeternium_sword", new SwordItem(EndToolMaterial.AETERNIUM, 3, -2.4F, makeItemSettings()));
public static final ToolItem AETERNIUM_PICKAXE = registerTool("aeternium_pickaxe", new EndPickaxe(EndToolMaterial.AETERNIUM, 1, -2.8F, makeItemSettings()));
public static final ToolItem AETERNIUM_AXE = registerTool("aeternium_axe", new EndAxe(EndToolMaterial.AETERNIUM, 5.0F, -3.0F, makeItemSettings()));
public static final ToolItem AETERNIUM_HOE = registerTool("aeternium_hoe", new EndHoe(EndToolMaterial.AETERNIUM, -3, 0.0F, makeItemSettings()));
public static final ToolItem AETERNIUM_HAMMER = registerTool("aeternium_hammer", new EndHammer(EndToolMaterial.AETERNIUM, 6.0F, -3.0F, 0.3D, makeItemSettings()));
public static final ToolItem IRON_HAMMER = registerTool("iron_hammer", new EndHammer(ToolMaterials.IRON, 5.0F, -3.2F, 0.2D, makeItemSettings()));
public static final ToolItem GOLDEN_HAMMER = registerTool("golden_hammer", new EndHammer(ToolMaterials.GOLD, 4.5F, -3.4F, 0.3D, makeItemSettings()));
public static final ToolItem DIAMOND_HAMMER = registerTool("diamond_hammer", new EndHammer(ToolMaterials.DIAMOND, 5.5F, -3.1F, 0.2D, makeItemSettings()));
public static final ToolItem NETHERITE_HAMMER = registerTool("netherite_hammer", new EndHammer(ToolMaterials.NETHERITE, 5.0F, -3.0F, 0.2D, makeItemSettings()));
public static final ToolItem AETERNIUM_PICKAXE = registerTool("aeternium_pickaxe", new EndPickaxeItem(EndToolMaterial.AETERNIUM, 1, -2.8F, makeItemSettings()));
public static final ToolItem AETERNIUM_AXE = registerTool("aeternium_axe", new EndAxeItem(EndToolMaterial.AETERNIUM, 5.0F, -3.0F, makeItemSettings()));
public static final ToolItem AETERNIUM_HOE = registerTool("aeternium_hoe", new EndHoeItem(EndToolMaterial.AETERNIUM, -3, 0.0F, makeItemSettings()));
public static final ToolItem AETERNIUM_HAMMER = registerTool("aeternium_hammer", new EndHammerItem(EndToolMaterial.AETERNIUM, 6.0F, -3.0F, 0.3D, makeItemSettings()));
public static final ToolItem IRON_HAMMER = registerTool("iron_hammer", new EndHammerItem(ToolMaterials.IRON, 5.0F, -3.2F, 0.2D, makeItemSettings()));
public static final ToolItem GOLDEN_HAMMER = registerTool("golden_hammer", new EndHammerItem(ToolMaterials.GOLD, 4.5F, -3.4F, 0.3D, makeItemSettings()));
public static final ToolItem DIAMOND_HAMMER = registerTool("diamond_hammer", new EndHammerItem(ToolMaterials.DIAMOND, 5.5F, -3.1F, 0.2D, makeItemSettings()));
public static final ToolItem NETHERITE_HAMMER = registerTool("netherite_hammer", new EndHammerItem(ToolMaterials.NETHERITE, 5.0F, -3.0F, 0.2D, makeItemSettings()));
// Food //
public final static Item SHADOW_BERRY_RAW = registerFood("shadow_berry_raw", 4, 0.5F);
@ -174,13 +174,13 @@ public class EndItems {
TagHelper.addTag((Tag.Identified<Item>) FabricToolTags.SHOVELS, item);
} else if (item instanceof SwordItem) {
TagHelper.addTag((Tag.Identified<Item>) FabricToolTags.SWORDS, item);
} else if (item instanceof EndPickaxe) {
} else if (item instanceof EndPickaxeItem) {
TagHelper.addTag((Tag.Identified<Item>) FabricToolTags.PICKAXES, item);
} else if (item instanceof EndAxe) {
} else if (item instanceof EndAxeItem) {
TagHelper.addTag((Tag.Identified<Item>) FabricToolTags.AXES, item);
} else if (item instanceof EndHoe) {
} else if (item instanceof EndHoeItem) {
TagHelper.addTag((Tag.Identified<Item>) FabricToolTags.HOES, item);
} else if (item instanceof EndHammer) {
} else if (item instanceof EndHammerItem) {
TagHelper.addTag((Tag.Identified<Item>) EndTags.HAMMERS, item);
}
@ -188,7 +188,7 @@ public class EndItems {
}
public static Item registerEgg(String name, EntityType<?> type, int background, int dots) {
SpawnEggItem item = new ItemSpawnEgg(type, background, dots, makeItemSettings());
SpawnEggItem item = new EndSpawnEggItem(type, background, dots, makeItemSettings());
ItemDispenserBehavior behavior = new ItemDispenserBehavior() {
public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
Direction direction = pointer.getBlockState().get(DispenserBlock.FACING);
@ -215,7 +215,7 @@ public class EndItems {
}
public static Item registerDrink(String name) {
return registerItem(name, new ItemDrink(makeItemSettings().maxCount(1)));
return registerItem(name, new DrinkItem(makeItemSettings().maxCount(1)));
}
public static Settings makeItemSettings() {