From b1922e695c6b53754538052dacb26b03f4dccd6f Mon Sep 17 00:00:00 2001 From: Sunskimmer822 <92886026+Sunskimmer822@users.noreply.github.com> Date: Wed, 23 Feb 2022 18:35:49 -0600 Subject: [PATCH] Full Release 1.0.0 --- CHANGELOG.md | 94 ------------------ README.md | 4 +- gradle.properties | 6 +- .../mod => serenas/shitmod}/FabricBlock.java | 2 +- .../mod => serenas/shitmod}/FabricItem.java | 2 +- .../mod => serenas/shitmod}/Hausbommer.java | 2 +- src/main/java/net/serenas/shitmod/Lean.java | 12 +++ .../shitmod/Shitmod.java} | 12 +-- .../shitmod/blockstates/fabric_block.json | 5 + .../assets/{testmod => shitmod}/icon.png | Bin .../resources/assets/shitmod/lang/en_us.json | 5 + .../models/block/fabric_block.json | 2 +- .../shitmod/models/item/fabric_block.json | 3 + .../models/item/fabric_item.json | 2 +- .../models/item/hausbommer.json | 2 +- .../textures/block/fabric_block.png | Bin .../textures/item/fabric_item.png | Bin .../textures/item/hausbommer.png | Bin .../testmod/blockstates/fabric_block.json | 5 - .../resources/assets/testmod/lang/en_us.json | 5 - .../testmod/models/item/fabric_block.json | 3 - .../minecraft/tags/blocks/mineable/hoe.json | 2 +- .../loot_tables/blocks/fabric_block.json | 2 +- .../portals/gayportal.json | 4 +- .../recipes/fabric_block.json | 2 +- .../recipes/fabric_item.json | 4 +- .../recipes/hausbommer.json | 6 +- src/main/resources/fabric.mod.json | 10 +- 28 files changed, 58 insertions(+), 138 deletions(-) delete mode 100644 CHANGELOG.md rename src/main/java/net/{test/mod => serenas/shitmod}/FabricBlock.java (93%) rename src/main/java/net/{test/mod => serenas/shitmod}/FabricItem.java (97%) rename src/main/java/net/{test/mod => serenas/shitmod}/Hausbommer.java (97%) create mode 100644 src/main/java/net/serenas/shitmod/Lean.java rename src/main/java/net/{test/mod/TestMod.java => serenas/shitmod/Shitmod.java} (78%) create mode 100644 src/main/resources/assets/shitmod/blockstates/fabric_block.json rename src/main/resources/assets/{testmod => shitmod}/icon.png (100%) create mode 100644 src/main/resources/assets/shitmod/lang/en_us.json rename src/main/resources/assets/{testmod => shitmod}/models/block/fabric_block.json (56%) create mode 100644 src/main/resources/assets/shitmod/models/item/fabric_block.json rename src/main/resources/assets/{testmod => shitmod}/models/item/fabric_item.json (55%) rename src/main/resources/assets/{testmod => shitmod}/models/item/hausbommer.json (56%) rename src/main/resources/assets/{testmod => shitmod}/textures/block/fabric_block.png (100%) rename src/main/resources/assets/{testmod => shitmod}/textures/item/fabric_item.png (100%) rename src/main/resources/assets/{testmod => shitmod}/textures/item/hausbommer.png (100%) delete mode 100644 src/main/resources/assets/testmod/blockstates/fabric_block.json delete mode 100644 src/main/resources/assets/testmod/lang/en_us.json delete mode 100644 src/main/resources/assets/testmod/models/item/fabric_block.json rename src/main/resources/data/{testmod => shitmod}/loot_tables/blocks/fabric_block.json (88%) rename src/main/resources/data/{testmod => shitmod}/portals/gayportal.json (56%) rename src/main/resources/data/{testmod => shitmod}/recipes/fabric_block.json (87%) rename src/main/resources/data/{testmod => shitmod}/recipes/fabric_item.json (79%) rename src/main/resources/data/{testmod => shitmod}/recipes/hausbommer.json (74%) diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 699edb0..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,94 +0,0 @@ -## Changelog -**0.0.1-beta 46** -Added the ability to set custom inPortal sounds and afterTP sounds. Also fixed portal ending up outside the worldBorder - -**0.0.1-beta 45** -Flat Portals are now fully functional. - -**0.0.1-beta 44** -Implement fully custom Portal Placing logic for the destination portal, no longer uses modified vanilla nether portal code. - -**0.0.1-beta 43** -Improve the lighting of portals. - -**0.0.1-beta 42** -Begin rework of server side only component. - -**0.0.1-beta 41** -Redo the detection of fluid ignited portals, should be more reliable. - -**0.0.1-beta 40** -Completely redo portal linking. They should always link together now. All existing portals will not link properly - -**0.0.1-beta 33** -Fix buckets placing the liquid when creating a portal - -**0.0.1-beta 32** -Fix crash - -**0.0.1-beta 31** -Fix portals not lighting - -**0.0.1-beta 30** -Make PortalLinks more safe, prevents some crashes too - -**0.0.1-beta 29** -Fixes an infinite loop when searching for a portalbase(thanks #17, Jack-Papel). Also makes CustomPortalBlock:getPortalBase non-static, allowing custom portal blocks to overwrite its logic - -**0.0.1-beta 28** -Fix portal nausea effect sometimes flashing back to the purple nether portal instance - -**0.0.1-beta 27** -Rename the modid to what it should've been in the first place. This does break existing portals but after a relight they should be fine - -**0.0.1-beta 26** -Remove Mod Menu from the dev environment - -**0.0.1-beta 25** -Further improves and simplifies the previous - -**0.0.1-beta 24** -Now calls vanilla teleport methods instead of our own modified vanilla methods. Fixes compat with other mods notably Immersive Portals - -**0.0.1-beta 23** -More work on syncing and better support for DataPack portals and ServerCustomPortals - -**0.0.1-beta 22** -Fixes beta 21 - -**0.0.1-beta 21** -Adds portal syncing from server to client, requiring only the server to have the portal registered. -Also adds the client side support for restoring features when playing on a server with the server side only version of CustomPortalApi - -**0.0.1-beta 20** -Really adds the ability to force a size for the portal this time. - -**0.0.1-beta 19** -Adds the ability to force a size for the portal. - -**0.0.1-beta 18** -Actually Adds support for custom fluid providers(buckets) - -**0.0.1-beta 17** -Adds support for custom fluid providers(buckets) - -**0.0.1-beta 16** -Adds PortalIgnitionSource - -**0.0.1-beta 15** -Fixes crash on dedicated servers - -**0.0.1-beta 14** -Adds error messages if registered portal contains null blocks. -Fix for a load order issue - -**0.0.1-beta 13** -Fix for rgb colors being wrong - -**0.0.1-beta 12** -Fix issue with duplicate POI's - -**0.0.1-beta 11** -Full support for RGB color tinting! - - diff --git a/README.md b/README.md index 01bb768..b9c2bf1 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,10 @@ idk about other IDEs but for vscode: on linux run ./gradlew vscode on windows run .\gradlew vscode +# Build + Finally, build it with linux: ./gradlew build windows: .\gradlew build -the resulting file will be located at [cloned folder]/build/libs/test-mod-VERSION.jar \ No newline at end of file +the resulting file will be located at [cloned folder]/build/libs/mod-VERSION.jar \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3a13493..0ab0204 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,9 +8,9 @@ org.gradle.jvmargs=-Xmx6G loader_version=0.12.12 # Mod Properties - mod_version = 3.0.0 - maven_group = com.test.mod - archives_base_name = test-mod + mod_version = 1.0.0 + maven_group = com.serenas.shitmod + archives_base_name = serenas-shitmod # Dependencies fabric_version=0.46.2+1.18 diff --git a/src/main/java/net/test/mod/FabricBlock.java b/src/main/java/net/serenas/shitmod/FabricBlock.java similarity index 93% rename from src/main/java/net/test/mod/FabricBlock.java rename to src/main/java/net/serenas/shitmod/FabricBlock.java index cd5c6e4..041b5cf 100644 --- a/src/main/java/net/test/mod/FabricBlock.java +++ b/src/main/java/net/serenas/shitmod/FabricBlock.java @@ -1,4 +1,4 @@ -package net.test.mod; +package net.serenas.shitmod; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; diff --git a/src/main/java/net/test/mod/FabricItem.java b/src/main/java/net/serenas/shitmod/FabricItem.java similarity index 97% rename from src/main/java/net/test/mod/FabricItem.java rename to src/main/java/net/serenas/shitmod/FabricItem.java index 9e8b96c..9d26c3c 100644 --- a/src/main/java/net/test/mod/FabricItem.java +++ b/src/main/java/net/serenas/shitmod/FabricItem.java @@ -1,4 +1,4 @@ -package net.test.mod; +package net.serenas.shitmod; import net.minecraft.entity.TntEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/net/test/mod/Hausbommer.java b/src/main/java/net/serenas/shitmod/Hausbommer.java similarity index 97% rename from src/main/java/net/test/mod/Hausbommer.java rename to src/main/java/net/serenas/shitmod/Hausbommer.java index 8978661..cdf56fa 100644 --- a/src/main/java/net/test/mod/Hausbommer.java +++ b/src/main/java/net/serenas/shitmod/Hausbommer.java @@ -1,4 +1,4 @@ -package net.test.mod; +package net.serenas.shitmod; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/src/main/java/net/serenas/shitmod/Lean.java b/src/main/java/net/serenas/shitmod/Lean.java new file mode 100644 index 0000000..52d464e --- /dev/null +++ b/src/main/java/net/serenas/shitmod/Lean.java @@ -0,0 +1,12 @@ +package net.serenas.shitmod; + +import net.minecraft.item.Item; + +public class Lean extends Item{ + + public Lean(Settings settings) { + super(settings); + //TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/net/test/mod/TestMod.java b/src/main/java/net/serenas/shitmod/Shitmod.java similarity index 78% rename from src/main/java/net/test/mod/TestMod.java rename to src/main/java/net/serenas/shitmod/Shitmod.java index 96c867c..caccb73 100644 --- a/src/main/java/net/test/mod/TestMod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -1,4 +1,4 @@ -package net.test.mod; +package net.serenas.shitmod; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; @@ -12,7 +12,7 @@ import net.minecraft.item.Items; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -public class TestMod implements ModInitializer { +public class Shitmod implements ModInitializer { public static final Item FABRIC_ITEM = new FabricItem(new Item.Settings().group(ItemGroup.MISC)); @@ -22,10 +22,10 @@ public class TestMod implements ModInitializer { @Override public void onInitialize() { - Registry.register(Registry.ITEM, new Identifier("testmod", "fabric_item"), FABRIC_ITEM); - Registry.register(Registry.BLOCK, new Identifier("testmod", "fabric_block"), FABRIC_BLOCK); - Registry.register(Registry.ITEM, new Identifier("testmod", "fabric_block"), new BlockItem(FABRIC_BLOCK, new FabricItemSettings().group(ItemGroup.MISC))); - Registry.register(Registry.ITEM, new Identifier("testmod", "hausbommer"), HAUSBOMMER_ITEM); + Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_item"), FABRIC_ITEM); + Registry.register(Registry.BLOCK, new Identifier("shitmod", "fabric_block"), FABRIC_BLOCK); + Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_block"), new BlockItem(FABRIC_BLOCK, new FabricItemSettings().group(ItemGroup.MISC))); + Registry.register(Registry.ITEM, new Identifier("shitmod", "hausbommer"), HAUSBOMMER_ITEM); CustomPortalBuilder.beginPortal() .frameBlock(Blocks.DIAMOND_BLOCK) .lightWithItem(Items.ENDER_EYE) diff --git a/src/main/resources/assets/shitmod/blockstates/fabric_block.json b/src/main/resources/assets/shitmod/blockstates/fabric_block.json new file mode 100644 index 0000000..a80a8ca --- /dev/null +++ b/src/main/resources/assets/shitmod/blockstates/fabric_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "shitmod:block/fabric_block"} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/testmod/icon.png b/src/main/resources/assets/shitmod/icon.png similarity index 100% rename from src/main/resources/assets/testmod/icon.png rename to src/main/resources/assets/shitmod/icon.png diff --git a/src/main/resources/assets/shitmod/lang/en_us.json b/src/main/resources/assets/shitmod/lang/en_us.json new file mode 100644 index 0000000..b56af44 --- /dev/null +++ b/src/main/resources/assets/shitmod/lang/en_us.json @@ -0,0 +1,5 @@ +{ + "item.shitmod.fabric_item": "Penis", + "block.shitmod.fabric_block": "Gay Block", + "item.shitmod.hausbommer": "Hausbommer" +} \ No newline at end of file diff --git a/src/main/resources/assets/testmod/models/block/fabric_block.json b/src/main/resources/assets/shitmod/models/block/fabric_block.json similarity index 56% rename from src/main/resources/assets/testmod/models/block/fabric_block.json rename to src/main/resources/assets/shitmod/models/block/fabric_block.json index b942a76..386c038 100644 --- a/src/main/resources/assets/testmod/models/block/fabric_block.json +++ b/src/main/resources/assets/shitmod/models/block/fabric_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "testmod:block/fabric_block" + "all": "shitmod:block/fabric_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/fabric_block.json b/src/main/resources/assets/shitmod/models/item/fabric_block.json new file mode 100644 index 0000000..cefb92b --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/fabric_block.json @@ -0,0 +1,3 @@ +{ + "parent": "shitmod:block/fabric_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/testmod/models/item/fabric_item.json b/src/main/resources/assets/shitmod/models/item/fabric_item.json similarity index 55% rename from src/main/resources/assets/testmod/models/item/fabric_item.json rename to src/main/resources/assets/shitmod/models/item/fabric_item.json index 26fbd78..cff27d5 100644 --- a/src/main/resources/assets/testmod/models/item/fabric_item.json +++ b/src/main/resources/assets/shitmod/models/item/fabric_item.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "testmod:item/fabric_item" + "layer0": "shitmod:item/fabric_item" } } \ No newline at end of file diff --git a/src/main/resources/assets/testmod/models/item/hausbommer.json b/src/main/resources/assets/shitmod/models/item/hausbommer.json similarity index 56% rename from src/main/resources/assets/testmod/models/item/hausbommer.json rename to src/main/resources/assets/shitmod/models/item/hausbommer.json index 3a6855b..671cce3 100644 --- a/src/main/resources/assets/testmod/models/item/hausbommer.json +++ b/src/main/resources/assets/shitmod/models/item/hausbommer.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "testmod:item/hausbommer" + "layer0": "shitmod:item/hausbommer" } } \ No newline at end of file diff --git a/src/main/resources/assets/testmod/textures/block/fabric_block.png b/src/main/resources/assets/shitmod/textures/block/fabric_block.png similarity index 100% rename from src/main/resources/assets/testmod/textures/block/fabric_block.png rename to src/main/resources/assets/shitmod/textures/block/fabric_block.png diff --git a/src/main/resources/assets/testmod/textures/item/fabric_item.png b/src/main/resources/assets/shitmod/textures/item/fabric_item.png similarity index 100% rename from src/main/resources/assets/testmod/textures/item/fabric_item.png rename to src/main/resources/assets/shitmod/textures/item/fabric_item.png diff --git a/src/main/resources/assets/testmod/textures/item/hausbommer.png b/src/main/resources/assets/shitmod/textures/item/hausbommer.png similarity index 100% rename from src/main/resources/assets/testmod/textures/item/hausbommer.png rename to src/main/resources/assets/shitmod/textures/item/hausbommer.png diff --git a/src/main/resources/assets/testmod/blockstates/fabric_block.json b/src/main/resources/assets/testmod/blockstates/fabric_block.json deleted file mode 100644 index 5467730..0000000 --- a/src/main/resources/assets/testmod/blockstates/fabric_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "testmod:block/fabric_block"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/testmod/lang/en_us.json b/src/main/resources/assets/testmod/lang/en_us.json deleted file mode 100644 index 7ed66f2..0000000 --- a/src/main/resources/assets/testmod/lang/en_us.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "item.testmod.fabric_item": "Penis", - "block.testmod.fabric_block": "Gay Block", - "item.testmod.hausbommer": "Hausbommer" -} \ No newline at end of file diff --git a/src/main/resources/assets/testmod/models/item/fabric_block.json b/src/main/resources/assets/testmod/models/item/fabric_block.json deleted file mode 100644 index 6d3f129..0000000 --- a/src/main/resources/assets/testmod/models/item/fabric_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "testmod:block/fabric_block" -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json index d9a9f83..f67d7f1 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -1,6 +1,6 @@ { "replace":false, "values": [ - "testmod:fabric_block" + "shitmod:fabric_block" ] } \ No newline at end of file diff --git a/src/main/resources/data/testmod/loot_tables/blocks/fabric_block.json b/src/main/resources/data/shitmod/loot_tables/blocks/fabric_block.json similarity index 88% rename from src/main/resources/data/testmod/loot_tables/blocks/fabric_block.json rename to src/main/resources/data/shitmod/loot_tables/blocks/fabric_block.json index 67aaa0a..703df4f 100644 --- a/src/main/resources/data/testmod/loot_tables/blocks/fabric_block.json +++ b/src/main/resources/data/shitmod/loot_tables/blocks/fabric_block.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "testmod:fabric_block", + "name": "shitmod:fabric_block", "functions": [ { "function": "minecraft:set_count", diff --git a/src/main/resources/data/testmod/portals/gayportal.json b/src/main/resources/data/shitmod/portals/gayportal.json similarity index 56% rename from src/main/resources/data/testmod/portals/gayportal.json rename to src/main/resources/data/shitmod/portals/gayportal.json index b985b5c..9483c02 100644 --- a/src/main/resources/data/testmod/portals/gayportal.json +++ b/src/main/resources/data/shitmod/portals/gayportal.json @@ -1,8 +1,8 @@ { - "block": "testmod:fabric_block", + "block": "shitmod:fabric_block", "dim": "minecraft:the_end", "ignitionType": "ITEM", - "ignitionSource": "testmod:fabric_item", + "ignitionSource": "shitmod:fabric_item", "r": 255, "g": 192, "b": 203 diff --git a/src/main/resources/data/testmod/recipes/fabric_block.json b/src/main/resources/data/shitmod/recipes/fabric_block.json similarity index 87% rename from src/main/resources/data/testmod/recipes/fabric_block.json rename to src/main/resources/data/shitmod/recipes/fabric_block.json index 2f97b22..35458e9 100644 --- a/src/main/resources/data/testmod/recipes/fabric_block.json +++ b/src/main/resources/data/shitmod/recipes/fabric_block.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "testmod:fabric_block", + "item": "shitmod:fabric_block", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/testmod/recipes/fabric_item.json b/src/main/resources/data/shitmod/recipes/fabric_item.json similarity index 79% rename from src/main/resources/data/testmod/recipes/fabric_item.json rename to src/main/resources/data/shitmod/recipes/fabric_item.json index 886d46c..f396445 100644 --- a/src/main/resources/data/testmod/recipes/fabric_item.json +++ b/src/main/resources/data/shitmod/recipes/fabric_item.json @@ -10,14 +10,14 @@ "item": "minecraft:dragon_head" }, "R": { - "item": "testmod:fabric_block" + "item": "shitmod:fabric_block" }, "W": { "item": "minecraft:netherite_block" } }, "result": { - "item": "testmod:fabric_item", + "item": "shitmod:fabric_item", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/testmod/recipes/hausbommer.json b/src/main/resources/data/shitmod/recipes/hausbommer.json similarity index 74% rename from src/main/resources/data/testmod/recipes/hausbommer.json rename to src/main/resources/data/shitmod/recipes/hausbommer.json index a778d6c..840cdbc 100644 --- a/src/main/resources/data/testmod/recipes/hausbommer.json +++ b/src/main/resources/data/shitmod/recipes/hausbommer.json @@ -7,10 +7,10 @@ ], "key": { "X": { - "item": "testmod:fabric_item" + "item": "shitmod:fabric_item" }, "R": { - "item": "testmod:fabric_block" + "item": "shitmod:fabric_block" }, "W": { "item": "minecraft:iron_block" @@ -20,7 +20,7 @@ } }, "result": { - "item": "testmod:hausbommer", + "item": "shitmod:hausbommer", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 664e297..b96dfea 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,12 +1,12 @@ { "schemaVersion": 1, - "id": "testmod", + "id": "shitmod", "version": "${version}", - "name": "Test Mod", + "name": "Serena's Shitmod", "description": "Just my first go at making a fabric mod", "authors": [ - "Me!" + "Me (Sunskimmer82#6969)" ], "contact": { "homepage": "https://fabricmc.net/", @@ -14,12 +14,12 @@ }, "license": "CC0-1.0", - "icon": "assets/testmod/icon.png", + "icon": "assets/shitmod/icon.png", "environment": "*", "entrypoints": { "main": [ - "net.test.mod.TestMod" + "net.serenas.shitmod.Shitmod" ] }, "mixins": [