diff --git a/CHANGELOG b/CHANGELOG index 08fadf9..e7de6c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ # Changes -- changed namespace of 'monarchpowers' directory to 'monarch-powers' to fit convention. -- added 'farmland' to list of blocks that the Blight will turn to coarse dirt upon stepping on it. \ No newline at end of file +- Fixed bug which caused the Monarch's solar energy to not be functional. +- Changed texture of the cotton crop. +- Changed texture of the cotton ball. +- Added Item "Ghostly Cloth". +- Renamed java class "sun_totem" to "sunTotem" to fit convention. \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java index 13e6ebf..a4b95f6 100644 --- a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java +++ b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java @@ -2,10 +2,7 @@ package com.smithy.terraoriginum; import com.smithy.terraoriginum.blocks.cottonCropBlock; import com.smithy.terraoriginum.blocks.crucifix; -import com.smithy.terraoriginum.items.iconItems; -import com.smithy.terraoriginum.items.sun_totem; -import com.smithy.terraoriginum.items.cottonItems; -import com.smithy.terraoriginum.items.umbrella; +import com.smithy.terraoriginum.items.*; import com.smithy.terraoriginum.registry.modEnchantments; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; @@ -27,10 +24,11 @@ public class TerraOriginum implements ModInitializer { crucifix.register(); cottonCropBlock.register(); cottonItems.register(); - sun_totem.register(); + sunTotem.register(); + ghostlyItems.register(); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(umbrella.UMBRELLA)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(sun_totem.SUN_TOTEM)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(sunTotem.SUN_TOTEM)); ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register((content) -> content.add(crucifix.CRUCIFIX)); ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register((content) -> content.add(cottonItems.COTTON_SEEDS)); ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register((content) -> content.add(cottonItems.COTTON_BALL)); diff --git a/src/main/java/com/smithy/terraoriginum/items/ghostlyItems.java b/src/main/java/com/smithy/terraoriginum/items/ghostlyItems.java new file mode 100644 index 0000000..378b4e6 --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/items/ghostlyItems.java @@ -0,0 +1,20 @@ +package com.smithy.terraoriginum.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class ghostlyItems { + + public static final Item GHOSTLY_CLOTH = new Item(new FabricItemSettings()); + + public static void register() { + + Registry.register(Registries.ITEM, new Identifier("terraoriginum", "ghostly_cloth"), GHOSTLY_CLOTH); + + } + + +} diff --git a/src/main/java/com/smithy/terraoriginum/items/sun_totem.java b/src/main/java/com/smithy/terraoriginum/items/sunTotem.java similarity index 95% rename from src/main/java/com/smithy/terraoriginum/items/sun_totem.java rename to src/main/java/com/smithy/terraoriginum/items/sunTotem.java index 50eee4c..a0800df 100644 --- a/src/main/java/com/smithy/terraoriginum/items/sun_totem.java +++ b/src/main/java/com/smithy/terraoriginum/items/sunTotem.java @@ -7,7 +7,7 @@ import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; -public class sun_totem { +public class sunTotem { public static final Item SUN_TOTEM = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); diff --git a/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json b/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json index 54811bb..90fad72 100644 --- a/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json +++ b/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json @@ -4,25 +4,25 @@ "model": "terraoriginum:block/cotton_crop_stage0" }, "age=1": { - "model": "terraoriginum:block/cotton_crop_stage0" + "model": "terraoriginum:block/cotton_crop_stage1" }, "age=2": { "model": "terraoriginum:block/cotton_crop_stage1" }, "age=3": { - "model": "terraoriginum:block/cotton_crop_stage1" + "model": "terraoriginum:block/cotton_crop_stage2" }, "age=4": { - "model": "terraoriginum:block/cotton_crop_stage2" + "model": "terraoriginum:block/cotton_crop_stage3" }, "age=5": { - "model": "terraoriginum:block/cotton_crop_stage2" + "model": "terraoriginum:block/cotton_crop_stage3" }, "age=6": { - "model": "terraoriginum:block/cotton_crop_stage2" + "model": "terraoriginum:block/cotton_crop_stage4" }, "age=7": { - "model": "terraoriginum:block/cotton_crop_stage3" + "model": "terraoriginum:block/cotton_crop_stage5" } } } diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index f0611b9..a5c0e81 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -8,6 +8,8 @@ "item.terraoriginum.cotton_seeds": "Cotton Seeds", "item.terraoriginum.cotton_ball": "Cotton ball", + "item.terraoriginum.ghostly_cloth": "Ghostly Cloth", + "item.terraoriginum.sun_totem": "Sun Totem", "death.attack.lack_of_ectoplasm": "%1$s faded away", diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json index d30efc5..63325ea 100644 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "textures": { - "crop": "terraoriginum:block/cotton_crop_block_stage0" + "cross": "terraoriginum:block/crop_cotton_0" } } diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json index 56163a7..e8df0e0 100644 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "textures": { - "crop": "terraoriginum:block/cotton_crop_block_stage1" + "cross": "terraoriginum:block/crop_cotton_1" } } diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json index e9eaf81..7c2af95 100644 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "textures": { - "crop": "terraoriginum:block/cotton_crop_block_stage2" + "cross": "terraoriginum:block/crop_cotton_2" } } diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json index 744385d..5a0ab03 100644 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "textures": { - "crop": "terraoriginum:block/cotton_crop_block_stage3" + "cross": "terraoriginum:block/crop_cotton_3" } } diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json new file mode 100644 index 0000000..5063029 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "terraoriginum:block/crop_cotton_4" + } + } + diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json new file mode 100644 index 0000000..744e9ad --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "terraoriginum:block/crop_cotton_5" + } + } + diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json new file mode 100644 index 0000000..2936806 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/ghostly_cloth" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage0.png b/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage0.png deleted file mode 100644 index 4f65c14..0000000 Binary files a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage0.png and /dev/null differ diff --git a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage1.png b/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage1.png deleted file mode 100644 index 3ee5db7..0000000 Binary files a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage1.png and /dev/null differ diff --git a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage2.png b/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage2.png deleted file mode 100644 index 6b3bb54..0000000 Binary files a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage2.png and /dev/null differ diff --git a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage3.png b/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage3.png deleted file mode 100644 index ce1b0e7..0000000 Binary files a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage3.png and /dev/null differ diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_0.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_0.png new file mode 100644 index 0000000..9e07042 Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_0.png differ diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_1.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_1.png new file mode 100644 index 0000000..f0b4bef Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_1.png differ diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_2.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_2.png new file mode 100644 index 0000000..bd629d0 Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_2.png differ diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_3.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_3.png new file mode 100644 index 0000000..2c2d6f9 Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_3.png differ diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_4.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_4.png new file mode 100644 index 0000000..4b8faec Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_4.png differ diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_5.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_5.png new file mode 100644 index 0000000..6033edf Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_5.png differ diff --git a/src/main/resources/assets/terraoriginum/textures/item/cotton_ball.png b/src/main/resources/assets/terraoriginum/textures/item/cotton_ball.png index 1df0fbe..7c5b03c 100644 Binary files a/src/main/resources/assets/terraoriginum/textures/item/cotton_ball.png and b/src/main/resources/assets/terraoriginum/textures/item/cotton_ball.png differ diff --git a/src/main/resources/assets/terraoriginum/textures/item/ghostly_cloth.png b/src/main/resources/assets/terraoriginum/textures/item/ghostly_cloth.png new file mode 100644 index 0000000..f078fec Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/item/ghostly_cloth.png differ diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json index ca82f15..90dc184 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json @@ -1,7 +1,7 @@ { "condition": { "type": "origins:resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "comparison": ">=", "compare_to": 50 }, @@ -48,7 +48,7 @@ }, { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": -50, "operation": "add" } diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json index 4f78cfb..88ae6d3 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json @@ -8,7 +8,7 @@ { "condition": { "type": "origins:resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "comparison": "<", "compare_to": 50 }, diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json index b537e2a..54f9651 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json @@ -1,7 +1,7 @@ { "condition": { "type": "origins:resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "comparison": ">=", "compare_to": 100 }, @@ -35,7 +35,7 @@ }, { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": -100, "operation": "add" }, diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json index 4f79d4a..4e7b837 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json @@ -6,7 +6,7 @@ "interval": 40, "entity_action": { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": 10, "operation": "add" } diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json index 2fac9b6..53b6094 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json @@ -21,7 +21,7 @@ }, { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": -300 } ] @@ -31,7 +31,7 @@ }, "condition": { "type": "origins:resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "comparison": ">=", "compare_to": 200 }, diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json index 4865875..114bebd 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json @@ -17,7 +17,7 @@ "interval": 40, "entity_action": { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": 4, "operation": "add" } diff --git a/src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json b/src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json new file mode 100644 index 0000000..617b5ac --- /dev/null +++ b/src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "#E#", + " # " + ], + "key": { + "#": { + "item": "terraoriginum:cotton_ball" + }, + "E": { + "item": "minecraft:echo_shard" + } + }, + "result": { + "item": "terraoriginum:ghostly_cloth", + "count": 1 + } +} \ No newline at end of file