Skip to content

Commit

Permalink
Added an item
Browse files Browse the repository at this point in the history
Moved data assets folder from minecraft to copper_extension
  • Loading branch information
Killarexe committed Feb 9, 2024
1 parent 06dfce7 commit 97d17c3
Show file tree
Hide file tree
Showing 22 changed files with 107 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"item.copper_extension.waxed_copper_ingot": "Waxed Copper Ingot",
"item.copper_extension.waxed_exposed_copper_ingot": "Waxed Exposed Copper Ingot",
"item.copper_extension.waxed_weathered_copper_ingot": "Waxed Weathered Copper Ingot",
"item.copper_extension.waxed_oxidized_copper_ingot": "Waxed Oxidized Copper Ingot",
"item.copper_extension.weathered_copper_ingot": "Weathered Copper Ingot",
"gamerule.copperOxidationChance": "Copper oxidation chance"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"item.copper_extension.waxed_copper_ingot": "Lingot de cuivre ciré",
"item.copper_extension.waxed_exposed_copper_ingot": "Lingot de cuivre exposé et ciré",
"item.copper_extension.waxed_weathered_copper_ingot": "Lingot de cuivre érodé et ciré",
"item.copper_extension.waxed_oxidized_copper_ingot": "Lingot de cuivre oxydé et ciré",
"item.copper_extension.weathered_copper_ingot": "Lingot de cuivre érodé",
"gamerule.copperOxidationChance": "Chance d'érosion du cuivre"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "copper_extension:item/oxidized_copper_ingot"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_material": {
"conditions": {
"items": [
{
"items": [
"copper_extension:waxed_oxidized_copper_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:waxed_oxidized_copper"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_material",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:waxed_oxidized_copper"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "copper_extension:waxed_oxidized_copper_ingot"
}
},
"pattern": [
"###",
"###",
"###"
],
"result": {
"item": "minecraft:waxed_oxidized_copper"
},
"show_notification": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "copper_extension:oxidized_copper_ingot"
},
{
"item": "minecraft:honeycomb"
}
],
"result": {
"item": "copper_extension:waxed_oxidized_copper_ingot"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
{
"item": "copper_extension:weathered_copper_ingot"
},
{
{
"item": "minecraft:honeycomb"
}
],
"result": {
"item": "copper_extension:waxed_weathered_copper_ingot"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,40 @@ public class CEItems {

private static final HashMap<String, Item> ITEMS = new HashMap<String, Item>();

public static final FabricScrapableItem WAXED_COPPER_INGOT = createItem("waxed_copper_ingot", new FabricScrapableItem(new FabricItemSettings(), new ResourceLocation("minecraft", "copper_ingot")));
public static final FabricScrapableItem WAXED_EXPOSED_COPPER_INGOT = createItem("waxed_exposed_copper_ingot", new FabricScrapableItem(new FabricItemSettings(), CEMod.id("exposed_copper_ingot")));
public static final FabricScrapableItem WAXED_WEATHERED_COPPER_INGOT = createItem("waxed_weathered_copper_ingot", new FabricScrapableItem(new FabricItemSettings(), CEMod.id("weathered_copper_ingot")));
public static final FabricScrapableItem WAXED_COPPER_INGOT = createItem(
"waxed_copper_ingot",
new FabricScrapableItem(new FabricItemSettings(), new ResourceLocation("minecraft", "copper_ingot"))
);

public static final FabricScrapableItem WAXED_EXPOSED_COPPER_INGOT = createItem(
"waxed_exposed_copper_ingot",
new FabricScrapableItem(new FabricItemSettings(), CEMod.id("exposed_copper_ingot"))
);

public static final FabricScrapableItem WAXED_WEATHERED_COPPER_INGOT = createItem(
"waxed_weathered_copper_ingot",
new FabricScrapableItem(new FabricItemSettings(), CEMod.id("weathered_copper_ingot"))
);

public static final FabricScrapableItem WAXED_OXIDIZED_COPPER_INGOT = createItem(
"waxed_oxidized_copper_ingot",
new FabricScrapableItem(new FabricItemSettings(), CEMod.id("oxidized_copper_ingot"))
);

public static final FabricRustableItem EXPOSED_COPPER_INGOT = createItem("exposed_copper_ingot", new FabricRustableItem(
new FabricItemSettings(),
new ResourceLocation("minecraft", "copper_ingot"),
CEMod.id("waxed_exposed_copper_ingot"),
CEMod.id("weathered_copper_ingot"))
);

public static final FabricRustableItem WEATHERED_COPPER_INGOT = createItem("weathered_copper_ingot", new FabricRustableItem(
new FabricItemSettings(),
CEMod.id("exposed_copper_ingot"),
CEMod.id("waxed_weathered_copper_ingot"),
CEMod.id("oxidized_copper_ingot")
));

public static final Item OXIDIZED_COPPER_INGOT = createItem("oxidized_copper_ingot", new FabricScrapableItem(new FabricItemSettings(), CEMod.id("weathered_copper_ingot")));

public static void register() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ public class CEItems {
"waxed_weathered_copper_ingot",
() -> new ForgeScrapableItem(new Item.Properties(), CEMod.id("weathered_copper_ingot"))
);

public static final RegistryObject<ForgeScrapableItem> WAXED_OXIDIZED_COPPER_INGOT = ITEMS.register(
"waxed_oxidized_copper_ingot",
() -> new ForgeScrapableItem(new Item.Properties(), CEMod.id("oxidized_copper_ingot"))
);

public static final RegistryObject<ForgeRustableItem> EXPOSED_COPPER_INGOT = ITEMS.register(
"exposed_copper_ingot",
Expand Down
2 changes: 1 addition & 1 deletion forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version="${mod_version}" #mandatory
displayName="${mod_name}" #mandatory
updateJSONURL="${mod_update_json_url}" #optional
displayURL="${mod_homepage_url}" #optional
logoFile="${mod_logo}" #optional
logoFile="assets/copper_extension/icon.png" #optional
authors="${mod_authors}" #optional
credits="${mod_credits}"
description='''${mod_description}'''
Expand Down

0 comments on commit 97d17c3

Please sign in to comment.