Skip to content

Commit

Permalink
Updated to 1.20.6
Browse files Browse the repository at this point in the history 
TODO:
Swords do not have damage
Fix bonus effect tooltips and tooltips for tools?
Fix food items
Check if autosmelt still works
Fix horse armor
  • Loading branch information
@Leronus
Leronus committed Jul 11, 2024
1 parent b108567 commit 8b55b8c
Show file tree
Hide file tree
Showing 16 changed files with 1,050 additions and 784 deletions.
5 changes: 5 additions & 0 deletions MORES-CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
v1.6.0
Updated to Minecraft 1.20.6
- Updated item groups to match vanilla
- Harvest level (temporarily?) removed from tooltips
-
1 change: 0 additions & 1 deletion MORES TODO.txt → MORES-TODO.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
check block xp values
fix horse armor
fix armor
fix foods
27 changes: 2 additions & 25 deletions src/main/java/mod/leronus/mores/Mores.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package mod.leronus.mores;

import mod.leronus.mores.block.ModBlocks;
//import mod.leronus.mores.item.ModItemGroups;
import mod.leronus.mores.item.ModItemGroups;
import mod.leronus.mores.item.ModItems;
import mod.leronus.mores.sound.ModSounds;
import mod.leronus.mores.world.gen.ModWorldGeneration;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.registry.FuelRegistry;
//import net.kyrptonaught.customportalapi.api.CustomPortalBuilder;
import net.minecraft.util.Identifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -18,7 +16,7 @@ public class Mores implements ModInitializer {

@Override
public void onInitialize() {
// ModItemGroups.registerItemGroups();
ModItemGroups.registerItemGroups();

ModItems.registerModItems();
ModBlocks.registerModBlocks();
Expand All @@ -38,26 +36,5 @@ public void onInitialize() {
// FabricDefaultAttributeRegistry.register(ModEntities.ALLOY_BLOCK, AlloyBlockEntity.createAlloyAttributes());

ModWorldGeneration.generateModWorldGen();

// CustomPortalBuilder.beginPortal()
// .frameBlock(ModBlocks.SILVER_BLOCK)
// .lightWithItem(ModItems.ANTHRACITE)
// .destDimID(new Identifier(Mores.MOD_ID, "reloaded"))
// .tintColor(14188952)
// .registerPortal();
//
// CustomPortalBuilder.beginPortal()
// .frameBlock(ModBlocks.RUBY_BLOCK)
// .lightWithItem(ModItems.ANTHRACITE)
// .destDimID(new Identifier(Mores.MOD_ID, "reloaded"))
// .tintColor(13061821)
// .registerPortal();
//
// CustomPortalBuilder.beginPortal()
// .frameBlock(ModBlocks.ONYX_BLOCK)
// .lightWithItem(ModItems.ANTHRACITE)
// .destDimID(new Identifier("the_end"))
// .tintColor(4408131)
// .registerPortal();
}
}
188 changes: 94 additions & 94 deletions src/main/java/mod/leronus/mores/datagen/ModModelProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,100 +317,100 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
itemModelGenerator.register(ModItems.NETHERITE_DAGGER, Models.HANDHELD);


// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TIN_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TIN_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TIN_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TIN_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.SILVER_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.SILVER_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.SILVER_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.SILVER_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.COPPER_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.COPPER_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.COPPER_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.COPPER_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.BRONZE_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.BRONZE_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.BRONZE_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.BRONZE_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.COBALT_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.COBALT_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.COBALT_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.COBALT_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.STERLING_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.STERLING_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.STERLING_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.STERLING_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.STEEL_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.STEEL_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.STEEL_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.STEEL_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.AMETHYST_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.AMETHYST_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.AMETHYST_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.AMETHYST_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.EMERALD_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.EMERALD_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.EMERALD_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.EMERALD_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOPAZ_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOPAZ_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOPAZ_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOPAZ_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOURMALINE_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOURMALINE_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOURMALINE_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOURMALINE_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TANZANITE_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TANZANITE_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TANZANITE_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TANZANITE_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.RUBY_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.RUBY_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.RUBY_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.RUBY_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.SAPPHIRE_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.SAPPHIRE_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.SAPPHIRE_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.SAPPHIRE_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.MOISSANITE_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.MOISSANITE_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.MOISSANITE_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.MOISSANITE_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TURQUOISE_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TURQUOISE_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TURQUOISE_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.TURQUOISE_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.OBSIDIAN_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.OBSIDIAN_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.OBSIDIAN_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.OBSIDIAN_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.ONYX_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.ONYX_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.ONYX_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.ONYX_BOOTS));
//
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_HELMET));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_CHESTPLATE));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_LEGGINGS));
// itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_BOOTS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TIN_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TIN_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TIN_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TIN_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.SILVER_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.SILVER_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.SILVER_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.SILVER_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.COPPER_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.COPPER_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.COPPER_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.COPPER_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.BRONZE_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.BRONZE_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.BRONZE_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.BRONZE_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.COBALT_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.COBALT_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.COBALT_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.COBALT_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.STERLING_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.STERLING_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.STERLING_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.STERLING_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.STEEL_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.STEEL_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.STEEL_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.STEEL_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.AMETHYST_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.AMETHYST_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.AMETHYST_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.AMETHYST_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.EMERALD_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.EMERALD_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.EMERALD_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.EMERALD_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOPAZ_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOPAZ_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOPAZ_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOPAZ_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOURMALINE_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOURMALINE_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOURMALINE_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TOURMALINE_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.TANZANITE_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TANZANITE_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TANZANITE_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TANZANITE_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.RUBY_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.RUBY_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.RUBY_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.RUBY_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.SAPPHIRE_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.SAPPHIRE_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.SAPPHIRE_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.SAPPHIRE_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.MOISSANITE_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.MOISSANITE_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.MOISSANITE_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.MOISSANITE_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.TURQUOISE_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TURQUOISE_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TURQUOISE_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.TURQUOISE_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.OBSIDIAN_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.OBSIDIAN_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.OBSIDIAN_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.OBSIDIAN_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.ONYX_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.ONYX_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.ONYX_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.ONYX_BOOTS));

itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_HELMET));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_CHESTPLATE));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_BOOTS));

// itemModelGenerator.register(ModItems.TIN_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.COPPER_HORSE_ARMOR, Models.GENERATED);
Expand Down
Loading

0 comments on commit 8b55b8c

Please sign in to comment.