Skip to content

Commit

Permalink
Backported to 1.19.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Majrusz committed Jan 23, 2023
1 parent f42c49c commit dc585fa
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 97 deletions.
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ apply plugin: 'org.spongepowered.mixin'

version = '1.1.3'
group = 'com.majruszsaccessories' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'majruszs-accessories-1.19.3'
archivesBaseName = 'majruszs-accessories-1.19.2'

// Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16.
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
Expand All @@ -25,7 +25,7 @@ compileJava {
}

minecraft {
mappings channel: 'official', version: '1.19.3'
mappings channel: 'official', version: '1.19.2'

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

Expand Down Expand Up @@ -81,11 +81,11 @@ repositories {
}

dependencies {
minecraft 'net.minecraftforge:forge:1.19.3-44.0.18'
implementation fg.deobf( 'com.mlib:majrusz-library-1.19.3:3.1.0' )
implementation fg.deobf( 'com.mlib:majruszs-difficulty-1.19.3:1.6.1' )
runtimeOnly fg.deobf( "top.theillusivec4.curios:curios-forge:1.19.3-5.1.1.2" )
compileOnly fg.deobf( "top.theillusivec4.curios:curios-forge:1.19.3-5.1.1.2:api" )
minecraft 'net.minecraftforge:forge:1.19.2-43.2.0'
implementation fg.deobf( 'com.mlib:majrusz-library-1.19.2:3.1.0' )
implementation fg.deobf( 'com.mlib:majruszs-difficulty-1.19.2:1.6.1' )
runtimeOnly fg.deobf( "top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0" )
compileOnly fg.deobf( "top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0:api" )
}

jar {
Expand Down
Binary file not shown.
Binary file not shown.
68 changes: 0 additions & 68 deletions src/main/java/com/majruszsaccessories/CreativeModeTabs.java

This file was deleted.

18 changes: 18 additions & 0 deletions src/main/java/com/majruszsaccessories/Registries.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,19 @@
import com.majruszsaccessories.recipes.CombineAccessoriesRecipe;
import com.mlib.annotations.AnnotationHandler;
import com.mlib.gamemodifiers.GameModifier;
import com.mlib.items.CreativeModeTabHelper;
import com.mlib.registries.RegistryHelper;
import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.inventory.InventoryMenu;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.InterModComms;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
Expand Down Expand Up @@ -52,6 +60,7 @@ public class Registries {

// Misc
public static final ResourceLocation ACCESSORY_SLOT_TEXTURE = Registries.getLocation( "item/empty_accessory_slot" );
public static final CreativeModeTab ITEM_GROUP = CreativeModeTabHelper.newTab( "majruszsaccessories.primary", LUCKY_ROCK );

// Game Modifiers
public static final List< GameModifier > GAME_MODIFIERS;
Expand All @@ -67,6 +76,8 @@ public static void initialize() {

HELPER.registerAll();
modEventBus.addListener( Registries::onEnqueueIMC );
DistExecutor.unsafeRunWhenOn( Dist.CLIENT, ()->()->modEventBus.addListener( Registries::onTextureStitch ) );

SERVER_CONFIG.register( ModLoadingContext.get() );
}

Expand All @@ -90,6 +101,13 @@ private static void onEnqueueIMC( InterModEnqueueEvent event ) {
);
}

@OnlyIn( Dist.CLIENT )
private static void onTextureStitch( TextureStitchEvent.Pre event ) {
final TextureAtlas map = event.getAtlas();
if( InventoryMenu.BLOCK_ATLAS.equals( map.location() ) )
event.addSprite( ACCESSORY_SLOT_TEXTURE );
}

public static class Modifiers {
public static final String DEFAULT_GROUP = Registries.getLocationString( "default" );
}
Expand Down
17 changes: 16 additions & 1 deletion src/main/java/com/majruszsaccessories/items/AccessoryItem.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.majruszsaccessories.items;

import com.majruszsaccessories.AccessoryHandler;
import com.majruszsaccessories.Registries;
import com.majruszsaccessories.gamemodifiers.AccessoryModifier;
import com.mlib.MajruszLibrary;
import net.minecraft.core.NonNullList;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
Expand All @@ -15,7 +19,7 @@ public class AccessoryItem extends Item {
final String id;

public AccessoryItem( String id ) {
super( new Properties().stacksTo( 1 ) );
super( new Properties().tab( Registries.ITEM_GROUP ).stacksTo( 1 ) );

this.id = id;
}
Expand All @@ -38,6 +42,17 @@ public Rarity getRarity( ItemStack itemStack ) {
return new AccessoryHandler( itemStack ).getItemRarity();
}

@Override
public void fillItemCategory( CreativeModeTab itemGroup, NonNullList< ItemStack > itemStacks ) {
if( !this.allowedIn( itemGroup ) )
return;

for( int i = 0; i < 9; ++i ) {
float bonus = Math.round( 100.0f * Mth.lerp( i / 8.0f, AccessoryHandler.MIN_BONUS, AccessoryHandler.MAX_BONUS ) ) / 100.0f;
itemStacks.add( AccessoryHandler.setup( new ItemStack( this ), bonus ).getItemStack() );
}
}

public List< AccessoryModifier > getModifiers() {
return MajruszLibrary.MOD_CONFIGS.get( this.id )
.getConfigs()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@
import com.majruszsaccessories.AccessoryHandler;
import com.majruszsaccessories.Registries;
import com.majruszsaccessories.items.AccessoryItem;
import net.minecraft.core.NonNullList;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.GsonHelper;
import net.minecraft.world.inventory.CraftingContainer;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.*;
import net.minecraft.world.level.Level;

Expand All @@ -31,7 +28,7 @@ public class AccessoryRecipe extends CustomRecipe {
}

public AccessoryRecipe( ResourceLocation id, AccessoryItem result, List< AccessoryItem > ingredients ) {
super( id, CraftingBookCategory.EQUIPMENT );
super( id );
this.result = result;
this.ingredients = ingredients;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.inventory.CraftingContainer;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.CraftingBookCategory;
import net.minecraft.world.item.crafting.CustomRecipe;
import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
import net.minecraft.world.item.crafting.SimpleRecipeSerializer;
import net.minecraft.world.level.Level;

import java.util.ArrayList;
Expand All @@ -20,11 +19,11 @@ public class CombineAccessoriesRecipe extends CustomRecipe {
public static float BONUS_OFFSET = 0.04f;

public static Supplier< RecipeSerializer< ? > > create() {
return ()->new SimpleCraftingRecipeSerializer<>( CombineAccessoriesRecipe::new );
return ()->new SimpleRecipeSerializer<>( CombineAccessoriesRecipe::new );
}

public CombineAccessoriesRecipe( ResourceLocation id, CraftingBookCategory category ) {
super( id, category );
public CombineAccessoriesRecipe( ResourceLocation id ) {
super( id );
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[44,)"
loaderVersion="[43,)"
license="MIT License"
issueTrackerURL="https://github.com/Majrusz/MajruszsAccessories/issues"

Expand All @@ -17,14 +17,14 @@ issueTrackerURL="https://github.com/Majrusz/MajruszsAccessories/issues"
[[dependencies.majruszsaccessories]]
modId="forge"
mandatory=true
versionRange="[44.0.0,)"
versionRange="[43.2.0,)"
ordering="NONE"
side="BOTH"

[[dependencies.majruszsaccessories]]
modId="minecraft"
mandatory=true
versionRange="[1.19.3,1.20)"
versionRange="[1.19.2,1.20)"
ordering="NONE"
side="BOTH"

Expand All @@ -38,7 +38,7 @@ issueTrackerURL="https://github.com/Majrusz/MajruszsAccessories/issues"
[[dependencies.majruszsaccessories]]
modId="curios"
mandatory=false
versionRange="[1.19.3-5.1.1.2,)"
versionRange="[1.19.2-5.1.1.0,)"
ordering="AFTER"
side="BOTH"

Expand Down

This file was deleted.

0 comments on commit dc585fa

Please sign in to comment.