Merge remote-tracking branch 'origin/master—' into master—

Lithewings · Jul 28, 2024 · a495eb1 · a495eb1
1 parent 16a290e
commit a495eb1
Show file tree

Hide file tree

Showing 53 changed files with 1,100 additions and 273 deletions.
diff --git a/src/main/generated/.cache/684a20b6ff997062e678180dff3c571444f18410 b/src/main/generated/.cache/684a20b6ff997062e678180dff3c571444f18410
diff --git a/src/main/java/com/equilibrium/MITEequilibrium.java b/src/main/java/com/equilibrium/MITEequilibrium.java
@@ -18,21 +18,17 @@
 import com.equilibrium.register.BlockEnityRegistry;
 import com.equilibrium.register.BlockInit;
 import com.equilibrium.register.UseBlock;
-import com.equilibrium.sound.SoundEventRegistry;
+import com.equilibrium.event.sound.SoundEventRegistry;
 import com.equilibrium.util.CreativeGroup;
-import com.equilibrium.worklevel.CraftingIngredients;
-import com.equilibrium.worklevel.FurnaceIngredients;
-
-
-
-
-
-
+import com.equilibrium.mixin.crafttime.worklevel.CraftingIngredients;
+import com.equilibrium.mixin.crafttime.worklevel.FurnaceIngredients;
 
 
+import static com.equilibrium.entity.ModEntities.registerModEntities;
 
 
-import static com.equilibrium.entity.ModEntities.registerModEntities;
+import static com.equilibrium.register.tags.ModBlockTags.registerModBlockTags;
+import static com.equilibrium.register.tags.ModItemTags.registerModItemTags;
 import static com.equilibrium.util.LootTableModifier.modifierLootTables;
 
 import static com.equilibrium.worldgen.ModPlacementGenerator.registerModOre;
@@ -84,6 +80,12 @@ public void onInitialize() {
 		PlayerBlockBreakEvents.AFTER.register(new BreakBlockEvent());
 
 
+		//创建标签
+		registerModBlockTags();
+		registerModItemTags();
+
+
+
 
 		config = new Config();
 		config.load();
@@ -104,10 +106,6 @@ public void onInitialize() {
 
 
 
-
-
-
-
 		LOGGER.info("Hello Fabric world!");
 	}
 

diff --git a/src/main/java/com/equilibrium/MITEequilibriumDataGenerator.java b/src/main/java/com/equilibrium/MITEequilibriumDataGenerator.java
@@ -1,17 +1,21 @@
 package com.equilibrium;
 
-import com.equilibrium.gen.ModLanguageTranslatorZhCn;
 import com.equilibrium.gen.ModModelProvider;
-import com.equilibrium.gen.ModRecipeGenerator;
+import com.equilibrium.gen.*;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 
 public class MITEequilibriumDataGenerator implements DataGeneratorEntrypoint {
+
+
 	@Override
 	public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator){
 		FabricDataGenerator.Pack pack=fabricDataGenerator.createPack();
 //		pack.addProvider(ModRecipeGenerator::new);
 //		pack.addProvider(ModModelProvider::new);
-		pack.addProvider(ModLanguageTranslatorZhCn::new);
+//		pack.addProvider(ModLanguageTranslatorZhCn::new);
+//		pack.addProvider(BlocksTagsGen::new);
+
+
 	}
 }
diff --git a/src/main/java/com/equilibrium/block/TheFurnace.java b/src/main/java/com/equilibrium/block/TheFurnace.java
@@ -1,7 +1,7 @@
 package com.equilibrium.block;
 
 
-import com.equilibrium.blockentity.TheFurnaceEntity;
+import com.equilibrium.block.blockentity.TheFurnaceEntity;
 
 import com.equilibrium.register.BlockEnityRegistry;
 

diff --git a/...librium/blockentity/TheFurnaceEntity.java → ...m/block/blockentity/TheFurnaceEntity.java b/...librium/blockentity/TheFurnaceEntity.java → ...m/block/blockentity/TheFurnaceEntity.java
@@ -1,4 +1,4 @@
-package com.equilibrium.blockentity;
+package com.equilibrium.block.blockentity;
 
 import com.equilibrium.register.BlockEnityRegistry;
 import com.equilibrium.register.BlockInit;

diff --git a/src/main/java/com/equilibrium/config/CommonConfig.java b/src/main/java/com/equilibrium/config/CommonConfig.java
@@ -34,64 +34,64 @@ public CommonConfig(){
     //序列化配置文件:写入配置文件
     public JsonObject serialize(){
         JsonObject root = new JsonObject();//父类
-//        JsonObject entry = new JsonObject();//子条目
-//        JsonObject entry_items_crafting_time = new JsonObject();//子条目
-//        JsonObject entry_item_crafttable_level = new JsonObject();//子条目
-//        JsonObject entry_item_furnace_levell = new JsonObject();//子条目
-//        JsonObject entry_fuel_item_level = new JsonObject();//子条目
-//        JsonObject entry_item_cooktime = new JsonObject();//子条目
-//
-//        entry.addProperty("desc0:", "若发现配置不生效，则是模组设定好的内容不可更改，如：铁锭的工作台等级为3");
-//        //物品合成时间========================================================================
-//        entry.addProperty("desc1:", "添加单个材料物品的合成所需时间,例如： " +
-//                "{\n" +
-//                "   \"minecraft:stick\": 20.0,\n" +
-//                "   \"minecraft:coal\": 20.0\n" +
-//                "}");
-//        entry.add(item_crafting_time,entry_items_crafting_time);
-//        craftItemTimeMap.forEach(entry_items_crafting_time::addProperty);
-//
-//        //物品工作台等级========================================================================
-//        entry.addProperty("desc2:", "添加单个材料物品的所需工作台等级,FLINT_CRAFTING_TABLE = 1, COPPER_CRAFTING_TABLE = 2, IRON_CRAFTING_TABLE = 3, DIAMOND_CRAFTING_TABLE = 4, NETHERITE_CRAFTING_TABLE = 5" +
-//                "例如： " +
-//                "{\n" +
-//                "   \"minecraft:stick\": 1,\n" +
-//                "   \"minecraft:coal\": 2\n" +
-//                "}");
-//        entry.add(item_crafttable_level,entry_item_crafttable_level);
-//        itemCrafttableLevelMap.forEach(entry_item_crafttable_level::addProperty);
-//
-//        //物品熔炼所需熔炉等级========================================================================
-//        entry.addProperty("desc3:", "添加物品熔炼所需熔炉等级,CLAY_FURNACE = 0, FURNACE = 1, BLAST_FURNACE = 1,OBSIDIAN_FURNACE = 2, NETHERRACK_FURNACE = 3" +
-//                "例如： " +
-//                "{\n" +
-//                "   \"minecraft:raw_copper\": 1,\n" +
-//                "   \"minecraft:raw_iron\": 2\n" +
-//                "}");
-//        entry.add(item_furnace_level,entry_item_furnace_levell);
-//        itemFurnaceLevelMap.forEach(entry_item_furnace_levell::addProperty);
-//
-//        //燃料的等级========================================================================
-//        entry.addProperty("desc4:", "添加燃料的等级,CLAY_FURNACE = 0, FURNACE = 1, BLAST_FURNACE = 1,OBSIDIAN_FURNACE = 2, NETHERRACK_FURNACE = 3" +
-//                "例如： " +
-//                "{\n" +
-//                "   \"minecraft:stick\": 1,\n" +
-//                "   \"minecraft:coal\": 2\n" +
-//                "}");
-//        entry.add(fuel_item_level,entry_fuel_item_level);
-//        fuelItemLevelMap.forEach(entry_fuel_item_level::addProperty);
-//
-//        //物品在熔炉中烧炼所需时间========================================================================
-//        entry.addProperty("desc5:", "添加物品在熔炉中烧炼所需时间,minecraft:iron_ore为200,minecraft:deepslate_iron_ore为802" +
-//                "例如： " +
-//                "{\n" +
-//                "   \"minecraft:iron_ore\": 200,\n" +
-//                "   \"minecraft:deepslate_iron_ore\": 802\n" +
-//                "}");
-//        entry.add(item_cooktime,entry_item_cooktime);
-//        itemCooktimeMap.forEach(entry_item_cooktime::addProperty);
-//
-//        root.add(fileConfigName, entry);//创建父类条目名称，并把子条目添加进去
+        JsonObject entry = new JsonObject();//子条目
+        JsonObject entry_items_crafting_time = new JsonObject();//子条目
+        JsonObject entry_item_crafttable_level = new JsonObject();//子条目
+        JsonObject entry_item_furnace_levell = new JsonObject();//子条目
+        JsonObject entry_fuel_item_level = new JsonObject();//子条目
+        JsonObject entry_item_cooktime = new JsonObject();//子条目
+
+        entry.addProperty("desc0:", "若发现配置不生效，则是模组设定好的内容不可更改，如：铁锭的工作台等级为3");
+        //物品合成时间========================================================================
+        entry.addProperty("desc1:", "添加单个材料物品的合成所需时间,例如： " +
+                "{\n" +
+                "   \"minecraft:stick\": 20.0,\n" +
+                "   \"minecraft:coal\": 20.0\n" +
+                "}");
+        entry.add(item_crafting_time,entry_items_crafting_time);
+        craftItemTimeMap.forEach(entry_items_crafting_time::addProperty);
+
+        //物品工作台等级========================================================================
+        entry.addProperty("desc2:", "添加单个材料物品的所需工作台等级,FLINT_CRAFTING_TABLE = 1, COPPER_CRAFTING_TABLE = 2, IRON_CRAFTING_TABLE = 3, DIAMOND_CRAFTING_TABLE = 4, NETHERITE_CRAFTING_TABLE = 5" +
+                "例如： " +
+                "{\n" +
+                "   \"minecraft:stick\": 1,\n" +
+                "   \"minecraft:coal\": 2\n" +
+                "}");
+        entry.add(item_crafttable_level,entry_item_crafttable_level);
+        itemCrafttableLevelMap.forEach(entry_item_crafttable_level::addProperty);
+
+        //物品熔炼所需熔炉等级========================================================================
+        entry.addProperty("desc3:", "添加物品熔炼所需熔炉等级,CLAY_FURNACE = 0, FURNACE = 1, BLAST_FURNACE = 1,OBSIDIAN_FURNACE = 2, NETHERRACK_FURNACE = 3" +
+                "例如： " +
+                "{\n" +
+                "   \"minecraft:raw_copper\": 1,\n" +
+                "   \"minecraft:raw_iron\": 2\n" +
+                "}");
+        entry.add(item_furnace_level,entry_item_furnace_levell);
+        itemFurnaceLevelMap.forEach(entry_item_furnace_levell::addProperty);
+
+        //燃料的等级========================================================================
+        entry.addProperty("desc4:", "添加燃料的等级,CLAY_FURNACE = 0, FURNACE = 1, BLAST_FURNACE = 1,OBSIDIAN_FURNACE = 2, NETHERRACK_FURNACE = 3" +
+                "例如： " +
+                "{\n" +
+                "   \"minecraft:stick\": 1,\n" +
+                "   \"minecraft:coal\": 2\n" +
+                "}");
+        entry.add(fuel_item_level,entry_fuel_item_level);
+        fuelItemLevelMap.forEach(entry_fuel_item_level::addProperty);
+
+        //物品在熔炉中烧炼所需时间========================================================================
+        entry.addProperty("desc5:", "添加物品在熔炉中烧炼所需时间,minecraft:iron_ore为200,minecraft:deepslate_iron_ore为802" +
+                "例如： " +
+                "{\n" +
+                "   \"minecraft:iron_ore\": 200,\n" +
+                "   \"minecraft:deepslate_iron_ore\": 802\n" +
+                "}");
+        entry.add(item_cooktime,entry_item_cooktime);
+        itemCooktimeMap.forEach(entry_item_cooktime::addProperty);
+
+        root.add(fileConfigName, entry);//创建父类条目名称，并把子条目添加进去
         return root;
     }
 

diff --git a/src/main/java/com/equilibrium/datapack/data.zip b/src/main/java/com/equilibrium/datapack/data.zip
diff --git a/src/main/java/com/equilibrium/event/BreakBlockEvent.java b/src/main/java/com/equilibrium/event/BreakBlockEvent.java
@@ -1,21 +1,28 @@
 package com.equilibrium.event;
+import com.equilibrium.register.tags.ModBlockTags;
+import com.equilibrium.util.IsMinable;
 import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
 import net.minecraft.block.*;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.Enchantments;
+import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.*;
 import net.minecraft.registry.RegistryKeys;
+import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Random;
 
+import static com.equilibrium.MITEequilibrium.LOGGER;
+
 public class BreakBlockEvent implements PlayerBlockBreakEvents.After{
 
+
     /**
      * Called after a block is successfully broken.
      *
@@ -27,9 +34,30 @@ public class BreakBlockEvent implements PlayerBlockBreakEvents.After{
      */
     @Override
     public void afterBlockBreak(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity) {
+
+        ItemStack itemStack =player.getMainHandStack();
+
+        player.sendMessage(Text.of("Block Harvest Level is :"+IsMinable.getBlockHarvertLevel(state)));
+        player.sendMessage(Text.of("Item Harvest Level is :"+IsMinable.getItemHarvertLevel(itemStack)));
+        player.sendMessage(Text.of(""+state.getBlock().toString()));
+
+        if(IsMinable.getBlockHarvertLevel(state)<=IsMinable.getItemHarvertLevel(itemStack))
+            player.sendMessage(Text.of("Is Minable"));
+        else{
+            player.sendMessage(Text.of("Not Minable"));
+        }
+
+
+        if(state.isIn(ModBlockTags.STONE_LIKE_240)){
+            itemStack.damage(240-1,player, EquipmentSlot.MAINHAND);
+        }
+        if(state.isIn(ModBlockTags.LOG_120)){
+            itemStack.damage(120-1,player, EquipmentSlot.MAINHAND);
+        }
+
         if (state.getBlock() == Blocks.GRAVEL) {
 
-            ItemStack itemStack =player.getMainHandStack();
+            itemStack =player.getMainHandStack();
             int funtuneLevel=EnchantmentHelper.getLevel(world.getRegistryManager().get(RegistryKeys.ENCHANTMENT).getEntry(Enchantments.FORTUNE).get(),itemStack);
             int slikTouch=EnchantmentHelper.getLevel(world.getRegistryManager().get(RegistryKeys.ENCHANTMENT).getEntry(Enchantments.SILK_TOUCH).get(),itemStack);
 

diff --git a/...equilibrium/sound/SoundEventRegistry.java → ...brium/event/sound/SoundEventRegistry.java b/...equilibrium/sound/SoundEventRegistry.java → ...brium/event/sound/SoundEventRegistry.java
@@ -1,4 +1,4 @@
-package com.equilibrium.sound;
+package com.equilibrium.event.sound;
 
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.Identifier;

diff --git a/src/main/java/com/equilibrium/gen/ModLanguageTranslatorZhCn.java b/src/main/java/com/equilibrium/gen/ModLanguageTranslatorZhCn.java
diff --git a/src/main/java/com/equilibrium/gen/ModRecipeGenerator.java b/src/main/java/com/equilibrium/gen/ModRecipeGenerator.java
@@ -5,6 +5,7 @@
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
 import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
 import net.minecraft.item.Items;
 import net.minecraft.recipe.book.RecipeCategory;
@@ -14,10 +15,10 @@
 import java.util.concurrent.CompletableFuture;
 
 public class ModRecipeGenerator extends FabricRecipeProvider {
+
     public ModRecipeGenerator(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
         super(output, registriesFuture);
     }
-
     @Override
     public void generate(RecipeExporter exporter) {
         ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, Tools.adamantium_axe).
@@ -26,9 +27,8 @@ public void generate(RecipeExporter exporter) {
                 pattern(" Y").
                 input('X', Metal.adamantium).
                 input('Y',Items.STICK).
-                criterion(FabricRecipeProvider.hasItem(Metal.adamantium),
-                        FabricRecipeProvider.conditionsFromItem(Metal.adamantium)).offerTo(exporter, Identifier.of("adamantium_axe"));
-
+                criterion("has_item", RecipeProvider.conditionsFromItem(Metal.adamantium)).
+                offerTo(exporter, Identifier.of("adamantium_axe"));
 
     }
 }
diff --git a/src/main/java/com/equilibrium/mixin/BlocksMixin.java b/src/main/java/com/equilibrium/mixin/BlocksMixin.java
@@ -0,0 +1,13 @@
+package com.equilibrium.mixin;
+
+import net.minecraft.block.*;
+import net.minecraft.block.enums.NoteBlockInstrument;
+import net.minecraft.sound.BlockSoundGroup;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import static net.minecraft.block.Blocks.register;
+
+@Mixin(Blocks.class)
+public class BlocksMixin {
+}
diff --git a/src/main/java/com/equilibrium/mixin/crafttime/MixinClientPlayerEntity.java b/src/main/java/com/equilibrium/mixin/crafttime/MixinClientPlayerEntity.java
@@ -1,7 +1,7 @@
 package com.equilibrium.mixin.crafttime;
 
 import com.equilibrium.ITimeCraftPlayer;
-import com.equilibrium.sound.SoundEventRegistry;
+import com.equilibrium.event.sound.SoundEventRegistry;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.AbstractClientPlayerEntity;

diff --git a/...librium/worklevel/CraftingIngredient.java → ...afttime/worklevel/CraftingIngredient.java b/...librium/worklevel/CraftingIngredient.java → ...afttime/worklevel/CraftingIngredient.java
@@ -1,4 +1,4 @@
-package com.equilibrium.worklevel;
+package com.equilibrium.mixin.crafttime.worklevel;
 
 public class CraftingIngredient {
     public static final int FLINT_CRAFTING_TABLE = 1, COPPER_CRAFTING_TABLE = 2, IRON_CRAFTING_TABLE = 3, DIAMOND_CRAFTING_TABLE = 4, NETHERITE_CRAFTING_TABLE = 5;

diff --git a/...ibrium/worklevel/CraftingIngredients.java → ...fttime/worklevel/CraftingIngredients.java b/...ibrium/worklevel/CraftingIngredients.java → ...fttime/worklevel/CraftingIngredients.java
@@ -1,4 +1,4 @@
-package com.equilibrium.worklevel;
+package com.equilibrium.mixin.crafttime.worklevel;
 
 import java.util.HashMap;
 

diff --git a/...ilibrium/worklevel/FurnaceIngredient.java → ...rafttime/worklevel/FurnaceIngredient.java b/...ilibrium/worklevel/FurnaceIngredient.java → ...rafttime/worklevel/FurnaceIngredient.java
@@ -1,4 +1,4 @@
-package com.equilibrium.worklevel;
+package com.equilibrium.mixin.crafttime.worklevel;
 
 public class FurnaceIngredient {
     public static final int COBBLESTONE_FURNACE = 1, OBSIDIAN_FURNACE = 2, NETHERRACK_FURNACE = 3;

diff --git a/...librium/worklevel/FurnaceIngredients.java → ...afttime/worklevel/FurnaceIngredients.java b/...librium/worklevel/FurnaceIngredients.java → ...afttime/worklevel/FurnaceIngredients.java
@@ -1,4 +1,4 @@
-package com.equilibrium.worklevel;
+package com.equilibrium.mixin.crafttime.worklevel;
 
 import java.util.HashMap;