update 0.9.9 (pre-release)

finished jeremium and added deepslate variants of all ores
This commit is contained in:
RyanTLG
2022-04-27 16:58:47 +02:00
parent 879271705a
commit 5d4eed24e1
42 changed files with 505 additions and 43 deletions

View File

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx6G
loader_version=0.12.12
# Mod Properties
mod_version = 1.18.1-0.6.5
mod_version = 1.18.1-0.9.9-unstable
maven_group = ryantlg.GamerMod.mod
archives_base_name = GamerMod

View File

@@ -0,0 +1,59 @@
package net.arcmods.ryantlg.armourMaterials;
import net.arcmods.ryantlg.items.miscItems.fabricOfReality;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.item.ArmorMaterial;
import net.minecraft.recipe.Ingredient;
import net.minecraft.sound.SoundEvent;
import net.minecraft.sound.SoundEvents;
public class notArmorMaterial implements ArmorMaterial{
// {boots, leggings, chestplate, helmet}
private static final int[] BASE_DURABILITY = new int[] {1200, 1290, 1350, 1210};
private static final int[] PROTECTION_VALUES = new int[] {15, 15, 15, 15};
// In which A is helmet, B chestplate, C leggings and D boots.
// For reference, Leather uses {1, 2, 3, 1}, and Diamond/Netherite {3, 6, 8, 3}
// {A, C, B, D}
@Override
public int getDurability(EquipmentSlot slot) {
return BASE_DURABILITY[slot.getEntitySlotId()] * 10;
}
@Override
public int getProtectionAmount(EquipmentSlot slot) {
return PROTECTION_VALUES[slot.getEntitySlotId()];
}
@Override
public int getEnchantability() {
return 100;
}
@Override
public SoundEvent getEquipSound() {
return SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE;
}
@Override
public Ingredient getRepairIngredient() {
return Ingredient.ofItems(fabricOfReality.FABRIC_OF_REALITY);
}
@Override
public String getName() {
// Must be all lowercase
return "not";
}
@Override
public float getToughness() {
return 10.0F;
}
@Override
public float getKnockbackResistance() {
return 10.0F;
}
}

View File

@@ -7,6 +7,7 @@ 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.sound.BlockSoundGroup;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
@@ -14,18 +15,18 @@ public class jeremiumBlocks {
public static final Block JEREMIUM_BLOCK = new jeremiumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool().luminance(16));
public static final Block JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5));
public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).luminance(5));
public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE));
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).fireproof().maxCount(56)));
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).fireproof().maxCount(56)));
Registry.register(Registry.BLOCK, new Identifier("gamermod", "deepslate_jeremium_ore"), DEEPSLATE_JEREMIUM_ORE);
Registry.register(Registry.ITEM, new Identifier("gamermod", "deepslate_jeremium_ore"), new BlockItem(DEEPSLATE_JEREMIUM_ORE, new FabricItemSettings().group(gamermod.CHING).fireproof().maxCount(56)));
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).fireproof().maxCount(56)));
gamermod.LOGGER.info("jeremiumBlocks loaded");
}

View File

@@ -6,17 +6,21 @@ 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.sound.BlockSoundGroup;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
public class omniumBlocks {
public static final Block OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool());
public static final Block OMNIUM_BLOCK = new Block(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool());
public static final Block DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
public static void register() {
Registry.register(Registry.BLOCK, new Identifier("gamermod", "omnium_ore"), OMNIUM_ORE);
Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_ore"), new BlockItem(OMNIUM_ORE, new FabricItemSettings().group(gamermod.CHING)));
Registry.register(Registry.BLOCK, new Identifier("gamermod", "deepslate_omnium_ore"), DEEPSLATE_OMNIUM_ORE);
Registry.register(Registry.ITEM, new Identifier("gamermod", "deepslate_omnium_ore"), new BlockItem(DEEPSLATE_OMNIUM_ORE, new FabricItemSettings().group(gamermod.CHING)));
Registry.register(Registry.BLOCK, new Identifier("gamermod", "omnium_block"), OMNIUM_BLOCK);
Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_block"), new BlockItem(OMNIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING)));

View File

@@ -7,6 +7,7 @@ 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.sound.BlockSoundGroup;
import net.minecraft.util.Identifier;
import net.minecraft.util.Rarity;
import net.minecraft.util.registry.Registry;
@@ -14,11 +15,14 @@ import net.minecraft.util.registry.Registry;
public class oriumBlocks {
public static final Block ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool());
public static final Block ORIUM_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool());
public static final Block DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
public static void register() {
Registry.register(Registry.BLOCK, new Identifier("gamermod", "orium_ore"), ORIUM_ORE);
Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_ore"), new BlockItem(ORIUM_ORE, new FabricItemSettings().group(gamermod.CHING).rarity(Rarity.UNCOMMON)));
Registry.register(Registry.BLOCK, new Identifier("gamermod", "deepslate_orium_ore"), DEEPSLATE_ORIUM_ORE);
Registry.register(Registry.ITEM, new Identifier("gamermod", "deepslate_orium_ore"), new BlockItem(DEEPSLATE_ORIUM_ORE, new FabricItemSettings().group(gamermod.CHING).rarity(Rarity.UNCOMMON)));
Registry.register(Registry.BLOCK, new Identifier("gamermod", "orium_block"), ORIUM_BLOCK);
Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_block"), new BlockItem(ORIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING).rarity(Rarity.UNCOMMON)));

View File

@@ -6,6 +6,7 @@ import net.arcmods.ryantlg.blocks.jeremiumBlocks;
import net.arcmods.ryantlg.blocks.omniumBlocks;
import net.arcmods.ryantlg.blocks.oriumBlocks;
import net.arcmods.ryantlg.items.armour.jeremiumArmour;
import net.arcmods.ryantlg.items.armour.notArmour;
import net.arcmods.ryantlg.items.armour.omniumArmour;
import net.arcmods.ryantlg.items.armour.oriumArmour;
import net.arcmods.ryantlg.items.itemsByCrop.weemItems;
@@ -104,6 +105,9 @@ public class gamermod implements ModInitializer {
jeremiumTools.register();
JeremiumOreGen.register();
notArmour.register();
}
//fight me
}

View File

@@ -0,0 +1,31 @@
package net.arcmods.ryantlg.items.armour;
import net.arcmods.ryantlg.gamermod;
import net.arcmods.ryantlg.armourMaterials.notArmorMaterial;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.item.ArmorItem;
import net.minecraft.item.ArmorMaterial;
import net.minecraft.item.Item;
import net.minecraft.util.Identifier;
import net.minecraft.util.Rarity;
import net.minecraft.util.registry.Registry;
public class notArmour {
public static final ArmorMaterial OMNIUM_ARMOR_MATERIAL = new notArmorMaterial();
public static final Item NOT_HELMET = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC));
public static final Item NOT_CHESTPLATE = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC));
public static final Item NOT_LEGGINGS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC));
public static final Item NOT_BOOTS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC));
public static void register() {
Registry.register(Registry.ITEM, new Identifier("gamermod", "not_helmet"), NOT_HELMET);
Registry.register(Registry.ITEM, new Identifier("gamermod", "not_chestplate"), NOT_CHESTPLATE);
Registry.register(Registry.ITEM, new Identifier("gamermod", "not_leggings"), NOT_LEGGINGS);
Registry.register(Registry.ITEM, new Identifier("gamermod", "not_boots"), NOT_BOOTS);
gamermod.LOGGER.info("notArmour loaded");
}
}

View File

@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "gamermod:block/deepslate_omnium_ore" }
}
}

View File

@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "gamermod:block/deepslate_orium_ore" }
}
}

View File

@@ -65,6 +65,9 @@
"item.gamermod.jeremium_hoe": "Jeremium Hoe",
"item.gamermod.jeremium_shovel": "Jeremium Shovel",
"item.gamermod.jeremium_pickaxe": "Jeremium Pickaxe",
"item.gamermod.jeremium_sword.tooltip": "Kinda heavy"
"item.gamermod.jeremium_sword.tooltip": "Kinda heavy",
"block.gamermod.deepslate_jeremium_ore": "Deepslate Jeremium Ore",
"block.gamermod.deepslate_omnium_ore": "Deepslate Omnium Ore",
"block.gamermod.deepslate_orium_ore": "Deepslate Orium Ore"
}

View File

@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "gamermod:block/deepslate_omnium_ore"
}
}

View File

@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "gamermod:block/deepslate_orium_ore"
}
}

View File

@@ -0,0 +1,3 @@
{
"parent": "gamermod:block/deepslate_omnium_ore"
}

View File

@@ -0,0 +1,3 @@
{
"parent": "gamermod:block/deepslate_orium_ore"
}

View File

@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "gamermod:item/"
}
}

View File

@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "gamermod:item/"
}
}

View File

@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "gamermod:item/"
}
}

View File

@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "gamermod:item/"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 841 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

View File

@@ -2,6 +2,7 @@
"replace": false,
"values": [
"gamermod:omnium_axe",
"gamermod:orium_axe"
"gamermod:orium_axe",
"gamermod:jeremium_axe"
]
}

View File

@@ -2,6 +2,7 @@
"replace": false,
"values": [
"gamermod:omnium_hoe",
"gamermod:orium_hoe"
"gamermod:orium_hoe",
"gamermod:jeremium_hoe"
]
}

View File

@@ -2,6 +2,7 @@
"replace": false,
"values": [
"gamermod:omnium_pickaxe",
"gamermod:orium_pickaxe"
"gamermod:orium_pickaxe",
"gamermod:jeremium_pickaxe"
]
}

View File

@@ -2,6 +2,7 @@
"replace": false,
"values": [
"gamermod:omnium_shovel",
"gamermod:orium_shovel"
"gamermod:orium_shovel",
"gamermod:jeremium_shovel"
]
}

View File

@@ -2,6 +2,7 @@
"replace": false,
"values": [
"gamermod:omnium_sword",
"gamermod:orium_sword"
"gamermod:orium_sword",
"gamermod:jeremium_sword"
]
}

View File

@@ -0,0 +1,49 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"name": "gamermod:deepslate_jeremium_ore",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
},
{
"type": "minecraft:item",
"name": "gamermod:raw_jeremium",
"functions": [
{
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:ore_drops"
},
{
"function": "minecraft:explosion_decay"
}
]
}
]
}
]
}
]
}

View File

@@ -0,0 +1,49 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"name": "gamermod:deepslate_omnium_ore",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
},
{
"type": "minecraft:item",
"name": "gamermod:raw_omnium",
"functions": [
{
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:ore_drops"
},
{
"function": "minecraft:explosion_decay"
}
]
}
]
}
]
}
]
}

View File

@@ -0,0 +1,49 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"name": "gamermod:deepslate_orium_ore",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
},
{
"type": "minecraft:item",
"name": "gamermod:raw_orium",
"functions": [
{
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:ore_drops"
},
{
"function": "minecraft:explosion_decay"
}
]
}
]
}
]
}
]
}

View File

@@ -0,0 +1,49 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"name": "gamermod:jeremium_ore",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
},
{
"type": "minecraft:item",
"name": "gamermod:raw_jeremium",
"functions": [
{
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:ore_drops"
},
{
"function": "minecraft:explosion_decay"
}
]
}
]
}
]
}
]
}

View File

@@ -1,8 +1,32 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"name": "gamermod:omnium_ore",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
},
{
"type": "minecraft:item",
"name": "gamermod:raw_omnium",
@@ -11,11 +35,11 @@
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:ore_drops"
}
],
"conditions": [
},
{
"condition": "minecraft:survives_explosion"
"function": "minecraft:explosion_decay"
}
]
}
]
}

View File

@@ -1,8 +1,32 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"name": "gamermod:orium_ore",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
},
{
"type": "minecraft:item",
"name": "gamermod:raw_orium",
@@ -11,11 +35,11 @@
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:ore_drops"
}
],
"conditions": [
},
{
"condition": "minecraft:survives_explosion"
"function": "minecraft:explosion_decay"
}
]
}
]
}

View File

@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"FFF",
"FFF",
"FFF"
],
"key": {
"F": {
"item": "gamermod:jeremium_ingot"
}
},
"result": {
"item": "gamermod:jeremium_block",
"count": 1
}
}

View File

@@ -0,0 +1,12 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "gamermod:jeremium_block"
}
],
"result": {
"item": "gamermod:jeremium_ingot",
"count": 9
}
}

View File

@@ -0,0 +1,9 @@
{
"type": "minecraft:blasting",
"ingredient": {
"item": "gamermod:raw_jeremium"
},
"result": "gamermod:jeremium_ingot",
"experience": 1.0,
"cookingtime": 100
}

View File

@@ -0,0 +1,9 @@
{
"type": "minecraft:smelting",
"ingredient": {
"item": "gamermod:raw_jeremium"
},
"result": "gamermod:jeremium_ingot",
"experience": 1,
"cookingtime": 250
}

View File

@@ -4,6 +4,8 @@
"gamermod:omnium_ore",
"gamermod:orium_ore",
"gamermod:jeremium_ore",
"gamermod:deepslate_jeremium_ore"
"gamermod:deepslate_jeremium_ore",
"gamermod:deepslate_omnium_ore",
"gamermod:deepslate_orium_ore"
]
}

View File

@@ -7,6 +7,8 @@
"gamermod:orium_ore",
"gamermod:jeremium_ore",
"gamermod:deepslate_jeremium_ore",
"gamermod:jeremium_block"
"gamermod:jeremium_block",
"gamermod:deepslate_omnium_ore",
"gamermod:deepslate_orium_ore"
]
}

View File

@@ -7,6 +7,8 @@
"gamermod:orium_ore",
"gamermod:jeremium_ore",
"gamermod:deepslate_jeremium_ore",
"gamermod:jeremium_block"
"gamermod:jeremium_block",
"gamermod:deepslate_omnium_ore",
"gamermod:deepslate_orium_ore"
]
}

View File

@@ -7,6 +7,8 @@
"gamermod:orium_ore",
"gamermod:jeremium_ore",
"gamermod:deepslate_jeremium_ore",
"gamermod:jeremium_block"
"gamermod:jeremium_block",
"gamermod:deepslate_omnium_ore",
"gamermod:deepslate_orium_ore"
]
}

View File

@@ -26,12 +26,12 @@
],
"depends": {
"fabricloader": ">=0.11.3",
"fabricloader": ">=0.12.12",
"fabric": "*",
"minecraft": "1.18.1",
"java": ">=17"
},
"suggests": {
"darkevolution": "*"
"darkevolution": "1.18.1-x"
}
}