From 66e9771c831f2d8514a9bdd5c6418bafb0ce8c81 Mon Sep 17 00:00:00 2001 From: RyanTLG <78032176+RyanTLG@users.noreply.github.com> Date: Tue, 29 Mar 2022 19:21:17 +0200 Subject: [PATCH] Jeremium update --- .../ryantlg/blocks/jeremiumBlocks.java | 27 ++++++++++++++++++ .../java/net/arcmods/ryantlg/gamermod.java | 2 ++ .../items/metalItems/jeremiumMetals.java | 20 ++----------- .../resources/assets/gamermod/lang/en_us.json | 4 ++- .../gamermod/models/item/jeremium_ingot.json | 6 ++++ .../gamermod/models/item/raw_jeremium.json | 6 ++++ .../gamermod/textures/item/jeremium_ingot.png | Bin 0 -> 813 bytes .../gamermod/textures/item/raw_jeremium.png | Bin 0 -> 1269 bytes 8 files changed, 46 insertions(+), 19 deletions(-) create mode 100644 src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java create mode 100755 src/main/resources/assets/gamermod/models/item/jeremium_ingot.json create mode 100755 src/main/resources/assets/gamermod/models/item/raw_jeremium.json create mode 100644 src/main/resources/assets/gamermod/textures/item/jeremium_ingot.png create mode 100644 src/main/resources/assets/gamermod/textures/item/raw_jeremium.png diff --git a/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java new file mode 100644 index 0000000..bc3d16f --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java @@ -0,0 +1,27 @@ +package net.arcmods.ryantlg.blocks; + +import net.arcmods.ryantlg.gamermod; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Material; +import net.minecraft.item.BlockItem; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class jeremiumBlocks { + + public static final Block JEREMIUM_BLOCK = new Block(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool()); + public static final Block JEREMIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool()); + + public static void register() { + Registry.register(Registry.BLOCK, new Identifier("gamermod", "jeremium_ore"), JEREMIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_ore"), new BlockItem(JEREMIUM_ORE, new FabricItemSettings().group(gamermod.CHING))); + + Registry.register(Registry.BLOCK, new Identifier("gamermod", "jeremium_block"), JEREMIUM_BLOCK); + Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_block"), new BlockItem(JEREMIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING))); + + gamermod.LOGGER.info("jeremiumBlocks loaded"); + } + +} diff --git a/src/main/java/net/arcmods/ryantlg/gamermod.java b/src/main/java/net/arcmods/ryantlg/gamermod.java index 06923d5..5164954 100755 --- a/src/main/java/net/arcmods/ryantlg/gamermod.java +++ b/src/main/java/net/arcmods/ryantlg/gamermod.java @@ -2,6 +2,7 @@ package net.arcmods.ryantlg; import net.arcmods.ryantlg.blocks.CropBlocks; import net.arcmods.ryantlg.blocks.FunnyBlocks; +import net.arcmods.ryantlg.blocks.jeremiumBlocks; import net.arcmods.ryantlg.blocks.omniumBlocks; import net.arcmods.ryantlg.blocks.oriumBlocks; import net.arcmods.ryantlg.items.armour.omniumArmour; @@ -95,6 +96,7 @@ public class gamermod implements ModInitializer { GamerEffects.register(); jeremiumMetals.register(); + jeremiumBlocks.register(); } } \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/items/metalItems/jeremiumMetals.java b/src/main/java/net/arcmods/ryantlg/items/metalItems/jeremiumMetals.java index 25b5141..9df1fcd 100644 --- a/src/main/java/net/arcmods/ryantlg/items/metalItems/jeremiumMetals.java +++ b/src/main/java/net/arcmods/ryantlg/items/metalItems/jeremiumMetals.java @@ -1,9 +1,6 @@ package net.arcmods.ryantlg.items.metalItems; import net.arcmods.ryantlg.gamermod; -import net.arcmods.ryantlg.statusEffects.GamerEffects; -import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; @@ -12,24 +9,11 @@ import net.minecraft.util.registry.Registry; public class jeremiumMetals { public static final Item JEREMIUM = new Item(new Item.Settings().fireproof().group(gamermod.CHING).maxCount(64).rarity(Rarity.UNCOMMON)); - public static final Item RAW_JEREMIUM = new Item(new Item.Settings() - .fireproof() - .group(gamermod.CHING) - .maxCount(64) - .rarity(Rarity.UNCOMMON) - .food( - new FoodComponent - .Builder() - .hunger(4) - .saturationModifier(03f) - .meat() - .snack() - .statusEffect(new StatusEffectInstance(GamerEffects.JEREMYD, 20*7), 1f) - .build() - )); + public static final Item RAW_JEREMIUM = new Item(new Item.Settings().fireproof().group(gamermod.CHING).maxCount(64).rarity(Rarity.UNCOMMON)); public static void register() { Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_ingot"), JEREMIUM); + Registry.register(Registry.ITEM, new Identifier("gamermod", "raw_jeremium"), RAW_JEREMIUM); gamermod.LOGGER.info("jeremiumMetals loaded"); } diff --git a/src/main/resources/assets/gamermod/lang/en_us.json b/src/main/resources/assets/gamermod/lang/en_us.json index 9a230d0..01b40eb 100755 --- a/src/main/resources/assets/gamermod/lang/en_us.json +++ b/src/main/resources/assets/gamermod/lang/en_us.json @@ -49,6 +49,8 @@ "item.gamermod.orium_pickaxe": "Orium Pickaxe", "item.gamermod.fabric_of_reality.tooltip": "Warning: has a chance to get §o§l§4RIPPED§r.", "item.gamermod.fabric_of_reality": "Fabric of Reality", - "effect.gamermod.high": "High" + "effect.gamermod.high": "High", + "item.gamermod.jeremium_ingot": "Jeremium Ingot", + "item.gamermod.raw_jeremium": "Raw Jeremium" } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_ingot.json b/src/main/resources/assets/gamermod/models/item/jeremium_ingot.json new file mode 100755 index 0000000..0738c0e --- /dev/null +++ b/src/main/resources/assets/gamermod/models/item/jeremium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gamermod:item/jeremium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/raw_jeremium.json b/src/main/resources/assets/gamermod/models/item/raw_jeremium.json new file mode 100755 index 0000000..462f599 --- /dev/null +++ b/src/main/resources/assets/gamermod/models/item/raw_jeremium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gamermod:item/raw_jeremium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_ingot.png b/src/main/resources/assets/gamermod/textures/item/jeremium_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..20dd7c7cdb136ed96bff2cbace2a3afdb46b8818 GIT binary patch literal 813 zcmV+|1JeA7P)x=*mSr>v1k(4m+d^`SZ(#M4m*I7||lF($HJ>pJNxVRjQxNnpX4B9Nv(5AFSU>{Ss=1F`zD z-zQX#RT30z+nS*AK7AdSD&YcE3gD!xgfDbdz(yhjR4Xu)py02|1=`=IgLCplq8OjH rzm2M7x|sZY7R#ZaD%L#re^1~W{muG$qx)Qr00000NkvXXu0mjf^mcWj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gamermod/textures/item/raw_jeremium.png b/src/main/resources/assets/gamermod/textures/item/raw_jeremium.png new file mode 100644 index 0000000000000000000000000000000000000000..aae1fac537fe526c0cad0aa9e171ddc60dbd19b4 GIT binary patch literal 1269 zcmVokUESjl9(y}zO2FjV z;CG$uzNMV^BBwV!9s1rCtr$_({F+f_4`0iqwjd2I&f2%xkTM^VX!C*|fkDu}Fp zZNl}#XQ<2*Hks25fYk}1h$EbzxYUUha)HV@3rr*Y<~D@d3*5n+q5ER z+Ng_!lo~jXm3nr4c`y89^y2v_OlPZ->rxRSNehh3DE%eNVgdMv@w@yH%Rpm;NYOlz zSEFH|U-pmf6J8+zSV}^U(ot2fD0wC0(=0Lt5oEeiKA`x207fvQc?E$g^#b*&#BMmu zZS|aE=ZVc13v=at<0EFk*MiT0<^a<%qN7h2K@Y4*+2gySwZI8R0mWN@BOG3ashtf` zVL*q33e|%O+#F{C)_n_9LjshI#u$M%G^$9nt^=0LA0H%0H{XK4fm6KrY$PD(4;?)T zY#^X}Ul+Xy#2R=gP?H|f=$O#a!v?qtSGEFYy|)a=xsGml+OyhG;UU+}@yEG$0x1!# f89lJyf86sw#1cc8pz{-{00000NkvXXu0mjftu$IQ literal 0 HcmV?d00001