Regenbogenspitzhacke

2026-10-28 17:30:12 +01:00
31 changed files with 18 additions and 225 deletions
@@ -41,7 +41,6 @@ run/crash-reports
 run/xaero
 run/screenshots
 run/Xaero*
-run/command_history.txt

 # java

@@ -2,21 +2,22 @@
 <projectDescription>
 	<name>mfmd2627</name>
 	<comment></comment>
-	<projects/>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments/>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments/>
-		</buildCommand>
-	</buildSpec>
-	<linkedResources/>
-	<filteredResources/>
 </projectDescription>
@@ -1,5 +1,5 @@
 #
-#Wed Sep 02 18:41:28 CEST 2026
+#Fri Jul 03 23:44:46 CEST 2026
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
@@ -5,12 +5,10 @@ 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;

 /**
 *
@@ -26,7 +24,6 @@ public class Mfmd2627 implements ModInitializer {
 	public void onInitialize() {
 		LOGGER.debug("initializing {}", MOD_ID);
 		List<Item> items = ModItems.registerItems();
-		List<Block> blocks = ModBlocks.registerBlocks();
-		ModTab.registerItemGroup(items, blocks);
+		ModTab.registerItemGroup(items);
 	}
 }
@@ -1,17 +0,0 @@
-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<Block> registerBlocks() {
-		List<Block> registeredBlocks = new ArrayList<>();
-		registeredBlocks.add(TIN_ORE);
-		return registeredBlocks;
-	}
-}
@@ -1,37 +0,0 @@
-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<Block.Properties, Block> 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);
-	}
-}
@@ -11,21 +11,13 @@ import net.minecraft.world.item.Item;
 *
 */
 public class ModItems extends ModItemsRegistrator {
-	public static final Item RAW_TIN = registerItem("raw_tin");
+	public static final Item STUB = registerItem("stub");
 	public static final Item RUBY = registerItem("ruby");
-	public static final Item CHILI = registerItem("chili");
-	public static final Item STUB = registerItem("stub", StubItem::new);
-	public static final Item TIN_INGOT = registerItem("tin_ingot");
-	public static final Item TIN_DUST = registerItem("tin_dust");

 	public static final List<Item> registerItems() {
 		List<Item> registeredItems = new ArrayList<>();
 		registeredItems.add(STUB);
 		registeredItems.add(RUBY);
-		registeredItems.add(CHILI);
-		registeredItems.add(RAW_TIN);
-		registeredItems.add(TIN_INGOT);
-		registeredItems.add(TIN_DUST);
 		return registeredItems;
 	}
 }
@@ -28,17 +28,6 @@ public abstract class ModItemsRegistrator {
 		return registerItem(name, new Item.Properties(), Item::new);
 	}

-	/**
-	 * register a new item with the name and its item class
-	 *
-	 * @param name the name
-	 * @param function the item class
-	 * @return the registered item
-	 */
-	public static final Item registerItem(String name, Function<Item.Properties, Item> function) {
-		return registerItem(name, new Item.Properties(), function);
-	}
-
 	/**
 	 * register a new item with the name, the properties and the Item class reference
 	 *
@@ -1,49 +0,0 @@
-package de.jottyfan.minecraft.item;
-
-import java.util.Map;
-
-import org.joml.Random;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.context.UseOnContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-
-/**
- * the stub item definition; specifies, what the stub can do
- */
-public class StubItem extends Item {
-	private static final Map<Block, Item> SLASH_MAP = Map.of(Blocks.HAY_BLOCK, Items.WHEAT, Blocks.DRIED_KELP_BLOCK,
-			Items.DRIED_KELP);
-
-	public StubItem(Properties properties) {
-		super(properties);
-	}
-
-	@Override
-	public InteractionResult useOn(UseOnContext context) {
-		Level level = context.getLevel();
-		BlockPos pos = context.getClickedPos();
-		Block block = level.getBlockState(pos).getBlock();
-		if (SLASH_MAP.containsKey(block) && !level.isClientSide()) {
-			level.setBlockAndUpdate(pos, Blocks.AIR.defaultBlockState());
-			level.playSound(null, pos, SoundEvents.HOE_TILL.value(), SoundSource.BLOCKS);
-			for (int i = 0; i < 9; i++) {
-				ItemStack stack = new ItemStack(SLASH_MAP.get(block));
-				float scatter = new Random().nextFloat();
-				ItemEntity entity = new ItemEntity(level, pos.getX(), pos.getY(), pos.getZ(),
-						stack, scatter, scatter, 0.2);
-				level.addFreshEntity(entity);
-			}
-		}
-		return InteractionResult.SUCCESS;
-	}
-}
@@ -14,7 +14,6 @@ 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;

 /**
 *
@@ -28,7 +27,7 @@ public class ModTab {
 	 *
 	 * @param items the items
 	 */
-	public static final void registerItemGroup(List<Item> items, List<Block> blocks) {
+	public static final void registerItemGroup(List<Item> items) {
 		ResourceKey<CreativeModeTab> tabKey = ResourceKey.create(Registries.CREATIVE_MODE_TAB,
 				Identifier.fromNamespaceAndPath(Mfmd2627.MOD_ID, "itemgroup"));

@@ -37,9 +36,6 @@ 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);
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "mfmd2627:block/tin_ore"
-    }
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "model": {
-    "type": "minecraft:model",
-		"model": "mfmd2627:item/chili"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "model": {
-    "type": "minecraft:model",
-		"model": "mfmd2627:item/raw_tin"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "model": {
-    "type": "minecraft:model",
-		"model": "mfmd2627:item/tin_dust"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "model": {
-    "type": "minecraft:model",
-		"model": "mfmd2627:item/tin_ingot"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "model": {
-    "type": "minecraft:model",
-		"model": "mfmd2627:block/tin_ore"
-  }
-}
@@ -1,9 +1,5 @@
 {
  "item.mfmd2627.stub": "Stummel",
-  "item.mfmd2627.raw_tin": "Zinn",
  "item.mfmd2627.ruby": "Rubin",
-  "item.mfmd2627.tin_dust": "Zinnpulver",
-  "item.mfmd2627.tin_ingot": "Zinnbarren",
-  "item.mfmd2627.tin_ore": "Zinnerz",
  "tab.mfmd2627": "Mfmd2627"
 }
@@ -1,9 +1,5 @@
 {
  "item.mfmd2627.stub": "Stub",
-  "item.mfmd2627.raw_tin": "Tin",
  "item.mfmd2627.ruby": "Ruby",
-  "item.mfmd2627.tin_dust": "Tin Dust",
-  "item.mfmd2627.tin_ingot": "Tin Ingot",
-  "item.mfmd2627.tin_ore": "Tin Ore",
  "tab.mfmd2627": "Mfmd2627"
 }
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:block/cube_all",
-  "textures": {
-    "all": "mfmd2627:block/tin_ore"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "mfmd2627:item/chili"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "mfmd2627:item/raw_tin"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "mfmd2627:item/tin_dust"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "mfmd2627:item/tin_ingot"
-  }
-}
@@ -1,3 +0,0 @@
-{
-  "parent": "minecraft:block/tin_ore"
-}