From 3fdeeb0bdbd4e606455a0c984d59b4b32d0f3f4f Mon Sep 17 00:00:00 2001 From: user Date: Wed, 30 Sep 2026 18:48:12 +0200 Subject: [PATCH 1/4] Add cat_food --- .project | 27 +++++++++--------- .settings/org.eclipse.jdt.core.prefs | 2 +- .../mfmd2627/textures/item/cat_food.png | Bin 0 -> 418 bytes 3 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/assets/mfmd2627/textures/item/cat_food.png diff --git a/.project b/.project index 910a523..ccfcc94 100644 --- a/.project +++ b/.project @@ -2,22 +2,21 @@ mfmd2627 - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - + org.eclipse.jdt.core.javanature org.eclipse.buildship.core.gradleprojectnature + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 4e9a3ed..faba1bd 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Fri Jul 03 23:44:46 CEST 2026 +#Wed Sep 02 18:41:28 CEST 2026 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 diff --git a/src/main/resources/assets/mfmd2627/textures/item/cat_food.png b/src/main/resources/assets/mfmd2627/textures/item/cat_food.png new file mode 100644 index 0000000000000000000000000000000000000000..3f782543ffde527c8ad0a97783769ada05547367 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>bP8ihkY6x^!?PP{AWo9E zy9+}HtE>l*!&%@FSqj(n6_r&QaTRn4 literal 0 HcmV?d00001 From f14df66360d48760c85721356e46b9dd7085f4af Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Thu, 1 Oct 2026 00:38:47 +0200 Subject: [PATCH 2/4] added tin_ingot and raw_tin --- .../java/de/jottyfan/minecraft/item/ModItems.java | 6 +++++- .../resources/assets/mfmd2627/items/raw_tin.json | 6 ++++++ .../assets/mfmd2627/items/tin_ingot.json | 6 ++++++ .../resources/assets/mfmd2627/lang/de_de.json | 2 ++ .../resources/assets/mfmd2627/lang/en_us.json | 2 ++ .../assets/mfmd2627/models/item/raw_tin.json | 6 ++++++ .../assets/mfmd2627/models/item/tin_ingot.json | 6 ++++++ .../assets/mfmd2627/textures/item/raw_tin.png | Bin 0 -> 336 bytes .../assets/mfmd2627/textures/item/tin_ingot.png | Bin 0 -> 325 bytes 9 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/mfmd2627/items/raw_tin.json create mode 100644 src/main/resources/assets/mfmd2627/items/tin_ingot.json create mode 100644 src/main/resources/assets/mfmd2627/models/item/raw_tin.json create mode 100644 src/main/resources/assets/mfmd2627/models/item/tin_ingot.json create mode 100644 src/main/resources/assets/mfmd2627/textures/item/raw_tin.png create mode 100644 src/main/resources/assets/mfmd2627/textures/item/tin_ingot.png diff --git a/src/main/java/de/jottyfan/minecraft/item/ModItems.java b/src/main/java/de/jottyfan/minecraft/item/ModItems.java index 9f6d32b..8c2479b 100644 --- a/src/main/java/de/jottyfan/minecraft/item/ModItems.java +++ b/src/main/java/de/jottyfan/minecraft/item/ModItems.java @@ -11,13 +11,17 @@ import net.minecraft.world.item.Item; * */ public class ModItems extends ModItemsRegistrator { - public static final Item STUB = registerItem("stub"); + public static final Item RAW_TIN = registerItem("raw_tin"); public static final Item RUBY = registerItem("ruby"); + public static final Item STUB = registerItem("stub"); + public static final Item TIN_INGOT = registerItem("tin_ingot"); public static final List registerItems() { List registeredItems = new ArrayList<>(); registeredItems.add(STUB); registeredItems.add(RUBY); + registeredItems.add(RAW_TIN); + registeredItems.add(TIN_INGOT); return registeredItems; } } diff --git a/src/main/resources/assets/mfmd2627/items/raw_tin.json b/src/main/resources/assets/mfmd2627/items/raw_tin.json new file mode 100644 index 0000000..b851887 --- /dev/null +++ b/src/main/resources/assets/mfmd2627/items/raw_tin.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "mfmd2627:item/raw_tin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/items/tin_ingot.json b/src/main/resources/assets/mfmd2627/items/tin_ingot.json new file mode 100644 index 0000000..ef1d43b --- /dev/null +++ b/src/main/resources/assets/mfmd2627/items/tin_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "mfmd2627:item/tin_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/lang/de_de.json b/src/main/resources/assets/mfmd2627/lang/de_de.json index 90330e6..7bbebb2 100644 --- a/src/main/resources/assets/mfmd2627/lang/de_de.json +++ b/src/main/resources/assets/mfmd2627/lang/de_de.json @@ -1,5 +1,7 @@ { "item.mfmd2627.stub": "Stummel", + "item.mfmd2627.raw_tin": "Zinn", "item.mfmd2627.ruby": "Rubin", + "item.mfmd2627.tin_ingot": "Zinnbarren", "tab.mfmd2627": "Mfmd2627" } \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/lang/en_us.json b/src/main/resources/assets/mfmd2627/lang/en_us.json index 3fbf68f..85d1f44 100644 --- a/src/main/resources/assets/mfmd2627/lang/en_us.json +++ b/src/main/resources/assets/mfmd2627/lang/en_us.json @@ -1,5 +1,7 @@ { "item.mfmd2627.stub": "Stub", + "item.mfmd2627.raw_tin": "Tin", "item.mfmd2627.ruby": "Ruby", + "item.mfmd2627.tin_ingot": "Tin Ingot", "tab.mfmd2627": "Mfmd2627" } \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/models/item/raw_tin.json b/src/main/resources/assets/mfmd2627/models/item/raw_tin.json new file mode 100644 index 0000000..22222e6 --- /dev/null +++ b/src/main/resources/assets/mfmd2627/models/item/raw_tin.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mfmd2627:item/raw_tin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/models/item/tin_ingot.json b/src/main/resources/assets/mfmd2627/models/item/tin_ingot.json new file mode 100644 index 0000000..4695e0f --- /dev/null +++ b/src/main/resources/assets/mfmd2627/models/item/tin_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mfmd2627:item/tin_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/textures/item/raw_tin.png b/src/main/resources/assets/mfmd2627/textures/item/raw_tin.png new file mode 100644 index 0000000000000000000000000000000000000000..d520e7b0419bbc89f401e72029f5d4eab840540e GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>Zx`z&h%wf(4U!2Q*v$p9o}~G*PE6{NBwurNRD>!?X9#bN!AK+ zSFtuJns8_qP#a@OkY6x^!?PP{Kn`btM`SSr1Gg{;GcwGYBLNg-FY)wsWq-vfCnjQW zjq$}IpisD{i(`ny<w4mM_(kAm+jmCWwr3GYL2GW T290$k44ofvPP)Tsw@SkfJR9T^xl z_H+M9WCijSl0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=d3- zBeIx*fm;}a85w5HkpK#^mw5WRvcKY#6BAU5IG?*7C^XyC#W6(V{MHK_c@H@VxLhp1 zRK zHe;#P9!aBF_TN}n^0nkoDZRMDdCjFT^GS;XW=vLE`{`^@gWu{6?~PNu-Q3N6+TypI zVywEWSY#^O7%na2bcZ!F^OujoK`EIc{=KYH&lz8d#+lBwyRg25y?cWGduNY=K%g@j NJYD@<);T3K0RSYXX)6E# literal 0 HcmV?d00001 From 1c4689207ded3236bd1d41860f705d9952e35eed Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sun, 4 Oct 2026 18:55:57 +0200 Subject: [PATCH 3/4] added tin ore block --- .../java/de/jottyfan/minecraft/Mfmd2627.java | 5 ++- .../jottyfan/minecraft/block/ModBlocks.java | 17 ++++++++ .../minecraft/block/ModBlocksRegistrator.java | 37 ++++++++++++++++++ .../de/jottyfan/minecraft/tab/ModTab.java | 6 ++- .../assets/mfmd2627/blockstates/tin_ore.json | 7 ++++ .../assets/mfmd2627/items/tin_ore.json | 6 +++ .../resources/assets/mfmd2627/lang/de_de.json | 1 + .../resources/assets/mfmd2627/lang/en_us.json | 1 + .../assets/mfmd2627/models/block/tin_ore.json | 6 +++ .../assets/mfmd2627/models/item/tin_ore.json | 3 ++ .../mfmd2627/textures/block/tin_ore.png | Bin 0 -> 576 bytes .../assets/mfmd2627/textures/item/raw_tin.png | Bin 336 -> 579 bytes 12 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 src/main/java/de/jottyfan/minecraft/block/ModBlocks.java create mode 100644 src/main/java/de/jottyfan/minecraft/block/ModBlocksRegistrator.java create mode 100644 src/main/resources/assets/mfmd2627/blockstates/tin_ore.json create mode 100644 src/main/resources/assets/mfmd2627/items/tin_ore.json create mode 100644 src/main/resources/assets/mfmd2627/models/block/tin_ore.json create mode 100644 src/main/resources/assets/mfmd2627/models/item/tin_ore.json create mode 100644 src/main/resources/assets/mfmd2627/textures/block/tin_ore.png diff --git a/src/main/java/de/jottyfan/minecraft/Mfmd2627.java b/src/main/java/de/jottyfan/minecraft/Mfmd2627.java index 87b1dff..467e4bb 100644 --- a/src/main/java/de/jottyfan/minecraft/Mfmd2627.java +++ b/src/main/java/de/jottyfan/minecraft/Mfmd2627.java @@ -5,10 +5,12 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.jottyfan.minecraft.block.ModBlocks; import de.jottyfan.minecraft.item.ModItems; import de.jottyfan.minecraft.tab.ModTab; import net.fabricmc.api.ModInitializer; import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; /** * @@ -24,6 +26,7 @@ public class Mfmd2627 implements ModInitializer { public void onInitialize() { LOGGER.debug("initializing {}", MOD_ID); List items = ModItems.registerItems(); - ModTab.registerItemGroup(items); + List blocks = ModBlocks.registerBlocks(); + ModTab.registerItemGroup(items, blocks); } } diff --git a/src/main/java/de/jottyfan/minecraft/block/ModBlocks.java b/src/main/java/de/jottyfan/minecraft/block/ModBlocks.java new file mode 100644 index 0000000..e9adf96 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/block/ModBlocks.java @@ -0,0 +1,17 @@ +package de.jottyfan.minecraft.block; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.world.level.block.Block; + +public class ModBlocks extends ModBlocksRegistrator { + + public static final Block TIN_ORE = registerBlock("tin_ore"); + + public static final List registerBlocks() { + List registeredBlocks = new ArrayList<>(); + registeredBlocks.add(TIN_ORE); + return registeredBlocks; + } +} diff --git a/src/main/java/de/jottyfan/minecraft/block/ModBlocksRegistrator.java b/src/main/java/de/jottyfan/minecraft/block/ModBlocksRegistrator.java new file mode 100644 index 0000000..beb768b --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/block/ModBlocksRegistrator.java @@ -0,0 +1,37 @@ +package de.jottyfan.minecraft.block; + +import java.util.function.Function; + +import de.jottyfan.minecraft.Mfmd2627; +import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; + +public class ModBlocksRegistrator { + + public static final Block registerBlock(String name) { + return registerBlock(name, BlockBehaviour.Properties.of(), Block::new); + } + + public static final Block registerBlock(String name, Properties properties, + Function function) { + Identifier identifier = Identifier.fromNamespaceAndPath(Mfmd2627.MOD_ID, name); + Block block = function.apply(properties.setId(ResourceKey.create(Registries.BLOCK, identifier))); + Registry.register(BuiltInRegistries.BLOCK, identifier, block); + registerBlockItem(identifier, block, new Item.Properties()); + return block; + } + + private static final void registerBlockItem(Identifier identifier, Block block, Item.Properties properties) { + BlockItem blockItem = new BlockItem(block, new Item.Properties() + .setId(ResourceKey.create(Registries.ITEM, identifier)).modelId(identifier).useItemDescriptionPrefix()); + Registry.register(BuiltInRegistries.ITEM, identifier, blockItem); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/tab/ModTab.java b/src/main/java/de/jottyfan/minecraft/tab/ModTab.java index a0f3864..e1b4e8d 100644 --- a/src/main/java/de/jottyfan/minecraft/tab/ModTab.java +++ b/src/main/java/de/jottyfan/minecraft/tab/ModTab.java @@ -14,6 +14,7 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.Block; /** * @@ -27,7 +28,7 @@ public class ModTab { * * @param items the items */ - public static final void registerItemGroup(List items) { + public static final void registerItemGroup(List items, List blocks) { ResourceKey tabKey = ResourceKey.create(Registries.CREATIVE_MODE_TAB, Identifier.fromNamespaceAndPath(Mfmd2627.MOD_ID, "itemgroup")); @@ -36,6 +37,9 @@ public class ModTab { for (Item item : items) { output.accept(item); } + for (Block block : blocks) { + output.accept(block.asItem()); + } }).build(); Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, tabKey, quicklyTab); diff --git a/src/main/resources/assets/mfmd2627/blockstates/tin_ore.json b/src/main/resources/assets/mfmd2627/blockstates/tin_ore.json new file mode 100644 index 0000000..2186c76 --- /dev/null +++ b/src/main/resources/assets/mfmd2627/blockstates/tin_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "mfmd2627:block/tin_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/items/tin_ore.json b/src/main/resources/assets/mfmd2627/items/tin_ore.json new file mode 100644 index 0000000..e5d6d40 --- /dev/null +++ b/src/main/resources/assets/mfmd2627/items/tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "mfmd2627:block/tin_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/lang/de_de.json b/src/main/resources/assets/mfmd2627/lang/de_de.json index 7bbebb2..084a58d 100644 --- a/src/main/resources/assets/mfmd2627/lang/de_de.json +++ b/src/main/resources/assets/mfmd2627/lang/de_de.json @@ -3,5 +3,6 @@ "item.mfmd2627.raw_tin": "Zinn", "item.mfmd2627.ruby": "Rubin", "item.mfmd2627.tin_ingot": "Zinnbarren", + "item.mfmd2627.tin_ore": "Zinnerz", "tab.mfmd2627": "Mfmd2627" } \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/lang/en_us.json b/src/main/resources/assets/mfmd2627/lang/en_us.json index 85d1f44..476aaa7 100644 --- a/src/main/resources/assets/mfmd2627/lang/en_us.json +++ b/src/main/resources/assets/mfmd2627/lang/en_us.json @@ -3,5 +3,6 @@ "item.mfmd2627.raw_tin": "Tin", "item.mfmd2627.ruby": "Ruby", "item.mfmd2627.tin_ingot": "Tin Ingot", + "item.mfmd2627.tin_ore": "Tin Ore", "tab.mfmd2627": "Mfmd2627" } \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/models/block/tin_ore.json b/src/main/resources/assets/mfmd2627/models/block/tin_ore.json new file mode 100644 index 0000000..583f8e8 --- /dev/null +++ b/src/main/resources/assets/mfmd2627/models/block/tin_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mfmd2627:block/tin_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/models/item/tin_ore.json b/src/main/resources/assets/mfmd2627/models/item/tin_ore.json new file mode 100644 index 0000000..d82552c --- /dev/null +++ b/src/main/resources/assets/mfmd2627/models/item/tin_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:block/tin_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/mfmd2627/textures/block/tin_ore.png b/src/main/resources/assets/mfmd2627/textures/block/tin_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..04d5ec22eafa57899225ff3a081fe334b35e9023 GIT binary patch literal 576 zcmV-G0>Axz@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUyz)(z7MKd!yFf=I72~2M?*SCMM6hLMoUdsO;cG^Q&Lk? zSV~r3Q&nD0TxMNfV_slvU}0xyXlQ9{b!u#LaCCZfb#!rfhj)F7dVY|9e}900fr5d6 zbcK$CgN1&CjeLcTg@%WQhK7WPiie4ddyJQgiHM7ik&BR>kdv2(m!g)Hn39*8kC~&F zo2QqYpq8DllAo)SqO6^xsGFy-^$zP)#mKm>-6ID z_7;dz5dZ)H32;bRa{vGf6951U69E94oEQKA00(qQO+^Rl3Iq@w4LUiWA^-pY%1J~) zR2b7GkbhgkFbsqv{z6gF4i3HGpkr83aLN=!Cw~8LWis2IIir8kMYMa0P2J#Q>@EiVdezk7^ O0000cE5ZGXm4OjJbx000000466SCMqf{G&V9fHby)#H$X)?KtVc0Nk2qI zM@2wCN>D*dPD@KiQA#y7$}S*s-mK_7$3XbyOVO4?lq-BPEFLJd7d}b2T);qSdo7THj(2+6gB+k!8 hg?Khz!M|L_t&-({+zQ z5`ZuW1AE1g{QtSO1f8*JE|8@#=@=i9v{{L>p$D=^RyBw~^9DG=7OYLke%25N0!St`~b5-%`=^B#pqyncD}##s}s6=2!g9Hfqno0002ovPDHLkV1jKdQWpRK From 7adba1c7d9a7a22533ca1da067b4c79c7f7d7521 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sun, 4 Oct 2026 18:57:03 +0200 Subject: [PATCH 4/4] added ignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 636169f..c5710ee 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ run/crash-reports run/xaero run/screenshots run/Xaero* +run/command_history.txt # java