mirror of
https://github.com/Creators-of-Create/Create.git
synced 2025-03-04 06:44:40 +01:00
Enhanced cardboard swords
- Fix cardboard swords taking damage
This commit is contained in:
IThundxr
parent
5ef8bf34da
commit
c6750239ea
2 changed files with 54 additions and 54 deletions
|
|
@ -1,9 +1,9 @@
|
|||
package com.simibubi.create;
|
||||
|
||||
import static com.simibubi.create.AllTags.forgeItemTag;
|
||||
import static com.simibubi.create.AllTags.AllItemTags.CREATE_INGOTS;
|
||||
import static com.simibubi.create.AllTags.AllItemTags.CRUSHED_RAW_MATERIALS;
|
||||
import static com.simibubi.create.AllTags.AllItemTags.PLATES;
|
||||
import static com.simibubi.create.AllTags.forgeItemTag;
|
||||
import static com.simibubi.create.Create.REGISTRATE;
|
||||
import static com.simibubi.create.foundation.data.recipe.CompatMetals.ALUMINUM;
|
||||
import static com.simibubi.create.foundation.data.recipe.CompatMetals.LEAD;
|
||||
|
|
@ -80,6 +80,7 @@ import net.minecraft.world.item.ArmorItem;
|
|||
import net.minecraft.world.item.ArmorMaterials;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.Rarity;
|
||||
|
||||
import net.minecraftforge.common.Tags;
|
||||
|
||||
public class AllItems {
|
||||
|
|
@ -105,7 +106,7 @@ public class AllItems {
|
|||
|
||||
public static final ItemEntry<SequencedAssemblyItem>
|
||||
|
||||
INCOMPLETE_PRECISION_MECHANISM = sequencedIngredient("incomplete_precision_mechanism"),
|
||||
INCOMPLETE_PRECISION_MECHANISM = sequencedIngredient("incomplete_precision_mechanism"),
|
||||
INCOMPLETE_REINFORCED_SHEET = sequencedIngredient("unprocessed_obsidian_sheet"),
|
||||
INCOMPLETE_TRACK = sequencedIngredient("incomplete_track");
|
||||
|
||||
|
|
@ -214,7 +215,7 @@ public class AllItems {
|
|||
IRON_SHEET = taggedIngredient("iron_sheet", forgeItemTag("plates/iron"), PLATES.tag),
|
||||
GOLDEN_SHEET = taggedIngredient("golden_sheet", forgeItemTag("plates/gold"), PLATES.tag, ItemTags.PIGLIN_LOVED),
|
||||
|
||||
CRUSHED_IRON = taggedIngredient("crushed_raw_iron", CRUSHED_RAW_MATERIALS.tag),
|
||||
CRUSHED_IRON = taggedIngredient("crushed_raw_iron", CRUSHED_RAW_MATERIALS.tag),
|
||||
CRUSHED_GOLD = taggedIngredient("crushed_raw_gold", CRUSHED_RAW_MATERIALS.tag, ItemTags.PIGLIN_LOVED),
|
||||
CRUSHED_COPPER = taggedIngredient("crushed_raw_copper", CRUSHED_RAW_MATERIALS.tag),
|
||||
CRUSHED_ZINC = taggedIngredient("crushed_raw_zinc", CRUSHED_RAW_MATERIALS.tag);
|
||||
|
|
@ -279,7 +280,7 @@ public class AllItems {
|
|||
|
||||
public static final ItemEntry<? extends BacktankItem>
|
||||
|
||||
COPPER_BACKTANK =
|
||||
COPPER_BACKTANK =
|
||||
REGISTRATE
|
||||
.item("copper_backtank",
|
||||
p -> new BacktankItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving"),
|
||||
|
|
@ -289,75 +290,75 @@ public class AllItems {
|
|||
.tag(forgeItemTag("armors/chestplates"))
|
||||
.register(),
|
||||
|
||||
NETHERITE_BACKTANK = REGISTRATE
|
||||
.item("netherite_backtank",
|
||||
p -> new BacktankItem.Layered(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving"),
|
||||
NETHERITE_BACKTANK_PLACEABLE))
|
||||
.model(AssetLookup.customGenericItemModel("_", "item"))
|
||||
.properties(p -> p.fireResistant())
|
||||
.tag(AllItemTags.PRESSURIZED_AIR_SOURCES.tag)
|
||||
.tag(forgeItemTag("armors/chestplates"))
|
||||
.register();
|
||||
NETHERITE_BACKTANK = REGISTRATE
|
||||
.item("netherite_backtank",
|
||||
p -> new BacktankItem.Layered(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving"),
|
||||
NETHERITE_BACKTANK_PLACEABLE))
|
||||
.model(AssetLookup.customGenericItemModel("_", "item"))
|
||||
.properties(p -> p.fireResistant())
|
||||
.tag(AllItemTags.PRESSURIZED_AIR_SOURCES.tag)
|
||||
.tag(forgeItemTag("armors/chestplates"))
|
||||
.register();
|
||||
|
||||
public static final ItemEntry<? extends DivingHelmetItem>
|
||||
|
||||
COPPER_DIVING_HELMET =
|
||||
COPPER_DIVING_HELMET =
|
||||
REGISTRATE
|
||||
.item("copper_diving_helmet",
|
||||
p -> new DivingHelmetItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving")))
|
||||
.tag(forgeItemTag("armors/helmets"))
|
||||
.register(),
|
||||
|
||||
NETHERITE_DIVING_HELMET = REGISTRATE
|
||||
.item("netherite_diving_helmet",
|
||||
p -> new DivingHelmetItem(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving")))
|
||||
.properties(p -> p.fireResistant())
|
||||
.tag(forgeItemTag("armors/helmets"))
|
||||
.register();
|
||||
NETHERITE_DIVING_HELMET = REGISTRATE
|
||||
.item("netherite_diving_helmet",
|
||||
p -> new DivingHelmetItem(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving")))
|
||||
.properties(p -> p.fireResistant())
|
||||
.tag(forgeItemTag("armors/helmets"))
|
||||
.register();
|
||||
|
||||
public static final ItemEntry<? extends DivingBootsItem>
|
||||
|
||||
COPPER_DIVING_BOOTS =
|
||||
COPPER_DIVING_BOOTS =
|
||||
REGISTRATE
|
||||
.item("copper_diving_boots",
|
||||
p -> new DivingBootsItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving")))
|
||||
.tag(forgeItemTag("armors/boots"))
|
||||
.register(),
|
||||
|
||||
NETHERITE_DIVING_BOOTS = REGISTRATE
|
||||
.item("netherite_diving_boots",
|
||||
p -> new DivingBootsItem(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving")))
|
||||
.properties(p -> p.fireResistant())
|
||||
.tag(forgeItemTag("armors/boots"))
|
||||
.register();
|
||||
NETHERITE_DIVING_BOOTS = REGISTRATE
|
||||
.item("netherite_diving_boots",
|
||||
p -> new DivingBootsItem(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving")))
|
||||
.properties(p -> p.fireResistant())
|
||||
.tag(forgeItemTag("armors/boots"))
|
||||
.register();
|
||||
|
||||
public static final ItemEntry<? extends BaseArmorItem>
|
||||
|
||||
CARDBOARD_HELMET = REGISTRATE.item("cardboard_helmet", p -> new CardboardHelmetItem(ArmorItem.Type.HELMET, p))
|
||||
CARDBOARD_HELMET = REGISTRATE.item("cardboard_helmet", p -> new CardboardHelmetItem(ArmorItem.Type.HELMET, p))
|
||||
.tag(forgeItemTag("armors/helmet"), ItemTags.TRIMMABLE_ARMOR)
|
||||
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor"))
|
||||
.model(TrimmableArmorModelGenerator::generate)
|
||||
.register(),
|
||||
|
||||
CARDBOARD_CHESTPLATE =
|
||||
REGISTRATE.item("cardboard_chestplate", p -> new CardboardArmorItem(ArmorItem.Type.CHESTPLATE, p))
|
||||
.tag(forgeItemTag("armors/chestplate"), ItemTags.TRIMMABLE_ARMOR)
|
||||
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor"))
|
||||
.model(TrimmableArmorModelGenerator::generate)
|
||||
.register(),
|
||||
|
||||
CARDBOARD_LEGGINGS =
|
||||
REGISTRATE.item("cardboard_leggings", p -> new CardboardArmorItem(ArmorItem.Type.LEGGINGS, p))
|
||||
.tag(forgeItemTag("armors/leggings"), ItemTags.TRIMMABLE_ARMOR)
|
||||
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor"))
|
||||
.model(TrimmableArmorModelGenerator::generate)
|
||||
.register(),
|
||||
|
||||
CARDBOARD_BOOTS = REGISTRATE.item("cardboard_boots", p -> new CardboardArmorItem(ArmorItem.Type.BOOTS, p))
|
||||
.tag(forgeItemTag("armors/boots"), ItemTags.TRIMMABLE_ARMOR)
|
||||
CARDBOARD_CHESTPLATE =
|
||||
REGISTRATE.item("cardboard_chestplate", p -> new CardboardArmorItem(ArmorItem.Type.CHESTPLATE, p))
|
||||
.tag(forgeItemTag("armors/chestplate"), ItemTags.TRIMMABLE_ARMOR)
|
||||
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor"))
|
||||
.model(TrimmableArmorModelGenerator::generate)
|
||||
.register();
|
||||
.register(),
|
||||
|
||||
CARDBOARD_LEGGINGS =
|
||||
REGISTRATE.item("cardboard_leggings", p -> new CardboardArmorItem(ArmorItem.Type.LEGGINGS, p))
|
||||
.tag(forgeItemTag("armors/leggings"), ItemTags.TRIMMABLE_ARMOR)
|
||||
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor"))
|
||||
.model(TrimmableArmorModelGenerator::generate)
|
||||
.register(),
|
||||
|
||||
CARDBOARD_BOOTS = REGISTRATE.item("cardboard_boots", p -> new CardboardArmorItem(ArmorItem.Type.BOOTS, p))
|
||||
.tag(forgeItemTag("armors/boots"), ItemTags.TRIMMABLE_ARMOR)
|
||||
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor"))
|
||||
.model(TrimmableArmorModelGenerator::generate)
|
||||
.register();
|
||||
|
||||
public static final ItemEntry<SandPaperItem> SAND_PAPER = REGISTRATE.item("sand_paper", SandPaperItem::new)
|
||||
.tag(AllTags.AllItemTags.SANDPAPER.tag)
|
||||
|
|
@ -443,11 +444,11 @@ public class AllItems {
|
|||
.lang("List Filter")
|
||||
.register(),
|
||||
|
||||
ATTRIBUTE_FILTER = REGISTRATE.item("attribute_filter", FilterItem::attribute)
|
||||
.register(),
|
||||
ATTRIBUTE_FILTER = REGISTRATE.item("attribute_filter", FilterItem::attribute)
|
||||
.register(),
|
||||
|
||||
PACKAGE_FILTER = REGISTRATE.item("package_filter", FilterItem::address)
|
||||
.register();
|
||||
PACKAGE_FILTER = REGISTRATE.item("package_filter", FilterItem::address)
|
||||
.register();
|
||||
|
||||
public static final ItemEntry<ScheduleItem> SCHEDULE = REGISTRATE.item("schedule", ScheduleItem::new)
|
||||
.lang("Train Schedule")
|
||||
|
|
@ -508,6 +509,7 @@ public class AllItems {
|
|||
|
||||
// Load this class
|
||||
|
||||
public static void register() {}
|
||||
public static void register() {
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,9 +11,7 @@ import net.minecraft.world.item.crafting.Ingredient;
|
|||
public enum AllToolMaterials implements Tier {
|
||||
|
||||
CARDBOARD(Create.asResource("cardboard")
|
||||
.toString(), 200, 1, 2, 1, () -> Ingredient.of(AllItems.CARDBOARD.asItem()))
|
||||
|
||||
;
|
||||
.toString(), 0, 1, 2, 1, () -> Ingredient.of(AllItems.CARDBOARD.asItem()));
|
||||
|
||||
public String name;
|
||||
|
||||
|
|
@ -24,7 +22,7 @@ public enum AllToolMaterials implements Tier {
|
|||
private Supplier<Ingredient> repairMaterial;
|
||||
|
||||
private AllToolMaterials(String name, int uses, float speed, float damageBonus, int enchantValue,
|
||||
Supplier<Ingredient> repairMaterial) {
|
||||
Supplier<Ingredient> repairMaterial) {
|
||||
this.name = name;
|
||||
this.uses = uses;
|
||||
this.speed = speed;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue