Skip to content

Commit

Permalink
Backported to 1.18.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Majrusz committed Aug 4, 2022
1 parent 1d85cbe commit 531c845
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 26 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

## Current Mod Releases (Source Code)
- [v1.7.3 for Minecraft 1.19.1](https://github.com/Majrusz/MajruszsEnchantmentsMod/tree/1.19.X)
- [v1.6.0 for Minecraft 1.18.1](https://github.com/Majrusz/MajruszsEnchantmentsMod/tree/1.18.1) *(not supported anymore)*
- [v1.6.3 for Minecraft 1.18.2](https://github.com/Majrusz/MajruszsEnchantmentsMod/tree/1.18.X) *(not supported anymore)*
- [v1.5.2 for Minecraft 1.17.1](https://github.com/Majrusz/MajruszsEnchantmentsMod/tree/1.17.1) *(not supported anymore)*
- [v1.3.5 for Minecraft 1.16.5 & 1.16.4](https://github.com/Majrusz/MajruszsEnchantmentsMod/tree/1.16.4) *(not supported anymore)*
- [v0.9.1 for Minecraft 1.16.3](https://github.com/Majrusz/MajruszsEnchantmentsMod/tree/old-main/WonderfulEnchantments1-16-3) *(not supported anymore)*
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ apply plugin: 'eclipse'
apply plugin: 'maven-publish'
apply plugin: 'org.spongepowered.mixin'

version = '1.7.3'
version = '1.6.3'
group = 'com.majruszsenchantments'
archivesBaseName = 'majruszs-enchantments-1.19.1'
archivesBaseName = 'majruszs-enchantments-1.18.2'

java.toolchain.languageVersion = JavaLanguageVersion.of(17)
compileJava {
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
}

minecraft {
mappings channel: 'official', version: '1.19.1'
mappings channel: 'official', version: '1.18.2'

accessTransformer = file( 'src/main/resources/META-INF/accesstransformer.cfg' ) // Currently, this location cannot be changed from the default.

Expand Down Expand Up @@ -97,8 +97,8 @@ repositories {
}

dependencies {
minecraft 'net.minecraftforge:forge:1.19.1-42.0.0'
implementation fg.deobf( 'com.mlib:majrusz-library-1.19.1:2.14.0' )
minecraft 'net.minecraftforge:forge:1.18.2-40.1.69'
implementation fg.deobf( 'com.mlib:majrusz-library-1.18.2:2.7.3' )
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
}

Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/java/com/majruszsenchantments/Registries.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.item.enchantment.EnchantmentCategory;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.loot.GlobalLootModifierSerializer;
import net.minecraftforge.common.loot.IGlobalLootModifier;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.DistExecutor;
Expand Down Expand Up @@ -42,7 +43,6 @@ public class Registries {

// Groups
static final DeferredRegister< Enchantment > ENCHANTMENTS = HELPER.create( ForgeRegistries.Keys.ENCHANTMENTS );
static final DeferredRegister< Codec< ? extends IGlobalLootModifier > > LOOT_MODIFIERS = HELPER.create( ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS );
static final DeferredRegister< ParticleType< ? > > PARTICLE_TYPES = HELPER.create( ForgeRegistries.Keys.PARTICLE_TYPES );

// Enchantment Categories
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.LivingEntity;
Expand Down Expand Up @@ -96,7 +97,7 @@ private void spawnParticles( OnEntityTickData data ) {
private void blockSleep( OnPlayerInteractData data ) {
data.event.setCancellationResult( InteractionResult.FAIL );
data.event.setCanceled( true );
data.player.displayClientMessage( Component.translatable( "enchantment.majruszsenchantments.vampirism_curse.block_sleep" ), true);
data.player.displayClientMessage( new TranslatableComponent( "enchantment.majruszsenchantments.vampirism_curse.block_sleep" ), true);
}

private static boolean isBedCondition( OnPlayerInteractData data ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
Expand Down Expand Up @@ -63,9 +65,9 @@ public float getDamageBonus( int level, MobType creature, ItemStack enchantedIte
@Override
public Component getFullname( int level ) {
if( level == this.getMaxLevel() ) {
return Component.translatable( "majruszsenchantments.true_level" )
return new TranslatableComponent( "majruszsenchantments.true_level" )
.append( " " )
.append( Component.translatable( getDescriptionId() ) )
.append( new TranslatableComponent( getDescriptionId() ) )
.withStyle( ChatFormatting.GRAY );
}

Expand Down Expand Up @@ -180,20 +182,20 @@ private void giveAdvancement( ServerPlayer player, String type, Supplier< Boolea
}

private void sendLevelUpMessage( Player player ) {
player.displayClientMessage( Component.translatable( "majruszsenchantments.fanatic_level_up" ).withStyle( ChatFormatting.BOLD ), true );
player.displayClientMessage( new TranslatableComponent( "majruszsenchantments.fanatic_level_up" ).withStyle( ChatFormatting.BOLD ), true );
}

private void sendRewardsMessage( Player player, Multiset< String > rewards ) {
MutableComponent message = Component.literal( ChatFormatting.WHITE + "(" );
MutableComponent message = new TextComponent( ChatFormatting.WHITE + "(" );
ImmutableList< String > rewardList = Multisets.copyHighestCountFirst( rewards ).elementSet().asList();
for( int i = 0; i < rewardList.size(); i++ ) {
message.append( Component.literal( ( ( i == 0 ) ? ChatFormatting.WHITE : ChatFormatting.GOLD ) + rewardList.get( i ) ) );
message.append( new TextComponent( ( ( i == 0 ) ? ChatFormatting.WHITE : ChatFormatting.GOLD ) + rewardList.get( i ) ) );
if( rewards.count( rewardList.get( i ) ) > 1 )
message.append( Component.literal( ChatFormatting.GOLD + " x" + rewards.count( rewardList.get( i ) ) ) );
message.append( new TextComponent( ChatFormatting.GOLD + " x" + rewards.count( rewardList.get( i ) ) ) );
if( i != rewardList.size() - 1 )
message.append( Component.literal( ChatFormatting.WHITE + ", " ) );
message.append( new TextComponent( ChatFormatting.WHITE + ", " ) );
}
message.append( Component.literal( ChatFormatting.WHITE + ")" ) );
message.append( new TextComponent( ChatFormatting.WHITE + ")" ) );

player.displayClientMessage( message, true );
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package com.majruszsenchantments.particles;

import com.majruszsenchantments.Registries;
import com.majruszsenchantments.MajruszsEnchantments;
import com.majruszsenchantments.Registries;
import net.minecraft.client.Minecraft;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;

@Mod.EventBusSubscriber( modid = MajruszsEnchantments.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD )
public class ParticleUtil {
@OnlyIn( Dist.CLIENT )
@SubscribeEvent
public static void registerParticles( RegisterParticleProvidersEvent event ) {
event.register( Registries.DODGE_PARTICLE.get(), DodgeParticle.Factory::new );
public static void registerParticles( ParticleFactoryRegisterEvent event ) {
Minecraft.getInstance().particleEngine.register( Registries.DODGE_PARTICLE.get(), DodgeParticle.Factory::new );
}
}
12 changes: 6 additions & 6 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
modLoader="javafml"
loaderVersion="[42,)"
loaderVersion="[40,)"
license="MIT License"
issueTrackerURL="https://github.com/Majrusz/MajruszsEnchantmentsMod/issues"

[[mods]]
modId="majruszsenchantments"
version="1.7.3"
version="1.6.3"
displayName="Majrusz's Enchantments"
updateJSONURL="https://raw.githubusercontent.com/Majrusz/MajruszsEnchantmentsMod/1.19.X/update.json"
updateJSONURL="https://raw.githubusercontent.com/Majrusz/MajruszsEnchantmentsMod/1.18.X/update.json"
displayURL="https://www.curseforge.com/minecraft/mc-mods/wonderful-enchantments"
logoFile="logo.png"
credits="Thanks for all your support and downloads!"
Expand All @@ -17,20 +17,20 @@ issueTrackerURL="https://github.com/Majrusz/MajruszsEnchantmentsMod/issues"
[[dependencies.majruszsenchantments]]
modId="forge"
mandatory=true
versionRange="[42.0.0,)"
versionRange="[40.1.69,)"
ordering="NONE"
side="BOTH"

[[dependencies.majruszsenchantments]]
modId="minecraft"
mandatory=true
versionRange="[1.19.1,1.20)"
versionRange="[1.18.2,1.19)"
ordering="NONE"
side="BOTH"

[[dependencies.majruszsenchantments]]
modId="majruszlib"
mandatory=true
versionRange="[2.14.0,3.0.0)"
versionRange="[2.7.3,3.0.0)"
ordering="NONE"
side="BOTH"
2 changes: 2 additions & 0 deletions update.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"1.17.1-recommended": "1.5.2",
"1.18.1-latest": "1.6.0",
"1.18.1-recommended": "1.6.0",
"1.18.2-latest": "1.6.3",
"1.18.2-recommended": "1.6.3",
"1.19-latest": "1.7.0",
"1.19-recommended": "1.7.0",
"1.19.1-latest": "1.7.3",
Expand Down

0 comments on commit 531c845

Please sign in to comment.