Skip to content

Commit

Permalink
Updated to 1.20.6
Browse files Browse the repository at this point in the history
ItemSwordMixin disabled (vanilla sword tooltips)
TODO:
Some armor pieces are missing (night vision needs checking)
Swords do not have damage
Check armor durability
Fix bonus effect tooltips and tooltips for tools
Fix ItemGroups & food items
Check if autosmelt still works
Fix horse armor
  • Loading branch information
Leronus committed Jul 1, 2024
1 parent 087f8fb commit b108567
Show file tree
Hide file tree
Showing 21 changed files with 1,324 additions and 1,380 deletions.
4 changes: 4 additions & 0 deletions MORES TODO.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
check block xp values
fix horse armor
fix armor
fix foods
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ dependencies {
// //Bobby
// modImplementation "maven.modrinth:M08ruV16:2cuVyTav"
//Nvidium
modImplementation "maven.modrinth:SfMw2IZN:${project.nvidium_version}"
// modImplementation "maven.modrinth:SfMw2IZN:${project.nvidium_version}"

//Custom Shields
modImplementation "maven.modrinth:7SDalH12:xY16zX6k"
// modImplementation "maven.modrinth:7SDalH12:xY16zX6k"
modImplementation "maven.modrinth:modmenu:${project.mod_menu_version}"
modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
modImplementation "com.github.Chocohead:Fabric-ASM:v${project.fabricasm_version}"
Expand Down
28 changes: 14 additions & 14 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
minecraft_version=1.20.6
yarn_mappings=1.20.6+build.3
loader_version=0.15.11

# Mod Properties
mod_version=1.4.0
mod_version=1.6.0
maven_group=mod.leronus.mores
archives_base_name=mores

# Dependencies
fabric_version=0.97.1+1.20.4
sodium_version=mc1.20.4-0.5.8
lithium_version=mc1.20.4-0.12.1
fabric_version=0.100.4+1.20.6
sodium_version=mc1.20.6-0.5.9
lithium_version=mc1.20.6-0.12.5

iris_version=gPXdh2Es
indium_version=VlLxDisa
iris_version=keLlmlCc
indium_version=XPsoVC5n

entity_culling_version=cj8nR3eG
continuity_version=Ox1racg8
nvidium_version=J2fuM58R
entity_culling_version=6U5rh26a
continuity_version=hI13Vg85
nvidium_version=Di2JxVAQ

fabric_shield_lib_version=1.7.2-1.20.4
midnightlib_version=1.5.3-fabric
mod_menu_version=9.2.0
fabric_shield_lib_version=1.7.2-1.20.6
midnightlib_version=1.5.5-fabric
mod_menu_version=10.0.0
fabricasm_version=2.3
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mod/leronus/mores/Mores.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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;
Expand All @@ -18,7 +18,7 @@ public class Mores implements ModInitializer {

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

ModItems.registerModItems();
ModBlocks.registerModBlocks();
Expand Down
129 changes: 62 additions & 67 deletions src/main/java/mod/leronus/mores/block/ModBlocks.java

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions src/main/java/mod/leronus/mores/datagen/ModModelProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -412,36 +412,36 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
// 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);
itemModelGenerator.register(ModItems.BRONZE_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.SILVER_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.COBALT_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.STERLING_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.STEEL_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.AMETHYST_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.EMERALD_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.TOPAZ_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.TOURMALINE_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.TANZANITE_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.RUBY_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.SAPPHIRE_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.MOISSANITE_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.TURQUOISE_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.OBSIDIAN_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.ONYX_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.GRAPHENE_HORSE_ARMOR, Models.GENERATED);
itemModelGenerator.register(ModItems.NETHERITE_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.TIN_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.COPPER_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.BRONZE_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.SILVER_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.COBALT_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.STERLING_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.STEEL_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.AMETHYST_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.EMERALD_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.TOPAZ_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.TOURMALINE_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.TANZANITE_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.RUBY_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.SAPPHIRE_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.MOISSANITE_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.TURQUOISE_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.OBSIDIAN_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.ONYX_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.GRAPHENE_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.NETHERITE_HORSE_ARMOR, Models.GENERATED);

itemModelGenerator.register(ModItems.ANTHRACITE, Models.GENERATED);

itemModelGenerator.register(ModItems.BRONZE_APPLE, Models.GENERATED);
itemModelGenerator.register(ModItems.SILVER_APPLE, Models.GENERATED);
itemModelGenerator.register(ModItems.COBALT_APPLE, Models.GENERATED);

itemModelGenerator.register(ModItems.VELVET, Models.GENERATED);
itemModelGenerator.register(ModItems.CHOCOLATE, Models.GENERATED);
itemModelGenerator.register(ModItems.CARROT_PIE, Models.GENERATED);
// itemModelGenerator.register(ModItems.BRONZE_APPLE, Models.GENERATED);
// itemModelGenerator.register(ModItems.SILVER_APPLE, Models.GENERATED);
// itemModelGenerator.register(ModItems.COBALT_APPLE, Models.GENERATED);
//
// itemModelGenerator.register(ModItems.VELVET, Models.GENERATED);
// itemModelGenerator.register(ModItems.CHOCOLATE, Models.GENERATED);
// itemModelGenerator.register(ModItems.CARROT_PIE, Models.GENERATED);
itemModelGenerator.register(ModItems.CHAIN, Models.GENERATED);
// itemModelGenerator.register(ModItems.DUCK, Models.GENERATED);
// itemModelGenerator.register(ModItems.COOKED_DUCK, Models.GENERATED);
Expand Down
Loading

0 comments on commit b108567

Please sign in to comment.