Skip to content

Commit

Permalink
1.19.3
Browse files Browse the repository at this point in the history
  • Loading branch information
MelanX committed Dec 18, 2022
1 parent 4cb2a3b commit e410dca
Show file tree
Hide file tree
Showing 11 changed files with 86 additions and 83 deletions.
6 changes: 3 additions & 3 deletions build.gradle
@@ -1,13 +1,13 @@
buildscript {
apply from: 'https://noeppi-noeppi.github.io/ModUtils/v3/buildscript.gradle', to: buildscript
apply from: 'https://moddingx.github.io/ModUtils/v4/buildscript.gradle', to: buildscript
}

apply from: 'https://noeppi-noeppi.github.io/ModUtils/v3/mod.gradle'
apply from: 'https://moddingx.github.io/ModUtils/v4/mod.gradle'

repositories {
maven { url = 'https://dvs1.progwml6.com/files/maven/' }
}

dependencies {
implementation fg.deobf("mezz.jei:jei-1.19.1-forge:11.2.0.241")
// implementation fg.deobf("mezz.jei:jei-1.19.1-forge:11.2.0.241")
}
5 changes: 3 additions & 2 deletions gradle.properties
Expand Up @@ -7,10 +7,11 @@ group=de.melanx
base_version=3.1

# dependencies
forge_version=1.19.1-42.0.1
forge_version=1.19.3-44.0.30
mappings=sugarcane_2022.12.18-1.19.3

# Upload properties
upload_versions=1.19.1
upload_versions=1.19.3
upload_release=release
modrinth_project=fM4ceeVu
curse_project=315068
Expand Down
29 changes: 18 additions & 11 deletions src/main/java/de/melanx/ultimatools/SkyblockUltimaTools.java
Expand Up @@ -2,8 +2,11 @@

import de.melanx.ultimatools.item.Registration;
import de.melanx.ultimatools.lib.ListHandlers;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig;
Expand All @@ -12,11 +15,10 @@
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLConfig;
import net.minecraftforge.fml.loading.FMLPaths;
import net.minecraftforge.registries.RegistryObject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import javax.annotation.Nonnull;

@Mod(SkyblockUltimaTools.MODID)
public class SkyblockUltimaTools {

Expand All @@ -26,18 +28,23 @@ public SkyblockUltimaTools() {
Registration.init();
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onServerStarted);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onConfigChange);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::creativeModTab);
}

public static final String MODID = "ultimatools";
public static final Logger LOGGER = LogManager.getLogger(MODID);
public static final CreativeModeTab TAB = new CreativeModeTab(MODID) {

@Nonnull
@Override
public ItemStack makeIcon() {
return new ItemStack(Registration.ultimaGod.get());
}
};

private void creativeModTab(CreativeModeTabEvent.Register event) {
event.registerCreativeModeTab(new ResourceLocation(MODID, "tab"), builder -> {
builder.title(Component.literal("Skyblock Ultima Tools"))
.icon(() -> new ItemStack(Registration.ultimaGod.get()))
.displayItems((enabledFeatures, output, hasPermissions) -> {
for (RegistryObject<Item> entry : Registration.ITEMS.getEntries()) {
output.accept(entry.get());
}
});
});
}

private void onServerStarted(FMLCommonSetupEvent event) {
ListHandlers.reloadLists();
Expand Down
84 changes: 42 additions & 42 deletions src/main/java/de/melanx/ultimatools/compat/JeiCompat.java
@@ -1,42 +1,42 @@
package de.melanx.ultimatools.compat;

import de.melanx.ultimatools.SkyblockUltimaTools;
import de.melanx.ultimatools.item.Registration;
import mezz.jei.api.IModPlugin;
import mezz.jei.api.JeiPlugin;
import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.registration.IRecipeRegistration;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;

import javax.annotation.Nonnull;

@JeiPlugin
@SuppressWarnings("ConstantConditions")
public class JeiCompat implements IModPlugin {

public static final ResourceLocation PLUGIN_UID = new ResourceLocation(SkyblockUltimaTools.MODID, "plugin/main");

@Override
public @Nonnull
ResourceLocation getPluginUid() {
return PLUGIN_UID;
}

@Nonnull
private static Component getDescKey(ResourceLocation name) {
return Component.translatable("jei." + name.getNamespace() + "." + name.getPath() + ".desc");
}

@Override
public void registerRecipes(@Nonnull IRecipeRegistration registration) {
for (RegistryObject<Item> registryObject : Registration.ITEMS.getEntries()) {
Item item = registryObject.get();
registration.addIngredientInfo(new ItemStack(item), VanillaTypes.ITEM_STACK, getDescKey(ForgeRegistries.ITEMS.getKey(item)));
}
}
}
//package de.melanx.ultimatools.compat;
//
//import de.melanx.ultimatools.SkyblockUltimaTools;
//import de.melanx.ultimatools.item.Registration;
//import mezz.jei.api.IModPlugin;
//import mezz.jei.api.JeiPlugin;
//import mezz.jei.api.constants.VanillaTypes;
//import mezz.jei.api.registration.IRecipeRegistration;
//import net.minecraft.network.chat.Component;
//import net.minecraft.resources.ResourceLocation;
//import net.minecraft.world.item.Item;
//import net.minecraft.world.item.ItemStack;
//import net.minecraftforge.registries.ForgeRegistries;
//import net.minecraftforge.registries.RegistryObject;
//
//import javax.annotation.Nonnull;
//
//@JeiPlugin
//@SuppressWarnings("ConstantConditions")
//public class JeiCompat implements IModPlugin {
//
// public static final ResourceLocation PLUGIN_UID = new ResourceLocation(SkyblockUltimaTools.MODID, "plugin/main");
//
// @Override
// public @Nonnull
// ResourceLocation getPluginUid() {
// return PLUGIN_UID;
// }
//
// @Nonnull
// private static Component getDescKey(ResourceLocation name) {
// return Component.translatable("jei." + name.getNamespace() + "." + name.getPath() + ".desc");
// }
//
// @Override
// public void registerRecipes(@Nonnull IRecipeRegistration registration) {
// for (RegistryObject<Item> registryObject : Registration.ITEMS.getEntries()) {
// Item item = registryObject.get();
// registration.addIngredientInfo(new ItemStack(item), VanillaTypes.ITEM_STACK, getDescKey(ForgeRegistries.ITEMS.getKey(item)));
// }
// }
//}
2 changes: 1 addition & 1 deletion src/main/java/de/melanx/ultimatools/data/ItemModels.java
Expand Up @@ -14,7 +14,7 @@
public class ItemModels extends ItemModelProvider {

public ItemModels(DataGenerator gen, ExistingFileHelper helper) {
super(gen, SkyblockUltimaTools.MODID, helper);
super(gen.getPackOutput(), SkyblockUltimaTools.MODID, helper);
}

@Override
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/de/melanx/ultimatools/item/Registration.java
Expand Up @@ -5,7 +5,6 @@
import de.melanx.ultimatools.util.ToolEffects;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraftforge.eventbus.api.IEventBus;
Expand All @@ -19,7 +18,6 @@
public class Registration {

public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, SkyblockUltimaTools.MODID);
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, SkyblockUltimaTools.MODID);

public static final RegistryObject<Item> beginner = ITEMS.register("beginner", () -> new UltimaTool(ServerConfig.BEGINNER.get(), ToolEffects::placeWater));
public static final RegistryObject<Item> bloodMagician = ITEMS.register("blood_magician", () -> new UltimaTool(ServerConfig.BLOOD_MAGICIAN.get(), ToolEffects::spawnAnimal));
Expand Down Expand Up @@ -47,6 +45,5 @@ public class Registration {
public static void init() {
IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(bus);
BLOCKS.register(bus);
}
}
3 changes: 1 addition & 2 deletions src/main/java/de/melanx/ultimatools/item/UltimaCrafting.java
@@ -1,11 +1,10 @@
package de.melanx.ultimatools.item;

import de.melanx.ultimatools.SkyblockUltimaTools;
import net.minecraft.world.item.Item;

public class UltimaCrafting extends Item {

public UltimaCrafting() {
super(new Item.Properties().stacksTo(1).tab(SkyblockUltimaTools.TAB));
super(new Item.Properties().stacksTo(1));
}
}
21 changes: 10 additions & 11 deletions src/main/java/de/melanx/ultimatools/item/UltimaTool.java
@@ -1,18 +1,17 @@
package de.melanx.ultimatools.item;

import de.melanx.ultimatools.SkyblockUltimaTools;
import de.melanx.ultimatools.lib.Function3;
import de.melanx.ultimatools.lib.Function5;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.InteractionResult;
import net.minecraft.core.Direction;
import net.minecraft.world.InteractionHand;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;

import javax.annotation.Nonnull;
Expand All @@ -30,7 +29,7 @@ public UltimaTool(Function3<Level, Player, InteractionHand, Boolean> applyEffect
}

public UltimaTool(int cooldown, Function3<Level, Player, InteractionHand, Boolean> applyEffect) {
super(new Item.Properties().stacksTo(1).durability(cooldown).tab(SkyblockUltimaTools.TAB));
super(new Item.Properties().stacksTo(1).durability(cooldown));
this.cooldown = cooldown;
this.applyEffect = applyEffect;
this.applyBlock = null;
Expand All @@ -42,7 +41,7 @@ public UltimaTool(Function5<Level, Player, InteractionHand, BlockPos, Direction,
}

public UltimaTool(int cooldown, Function5<Level, Player, InteractionHand, BlockPos, Direction, Boolean> applyBlock) {
super(new Item.Properties().stacksTo(1).durability(cooldown).tab(SkyblockUltimaTools.TAB));
super(new Item.Properties().stacksTo(1).durability(cooldown));
this.cooldown = cooldown;
this.applyEffect = null;
this.applyBlock = applyBlock;
Expand All @@ -54,7 +53,7 @@ public UltimaTool(Function3<Level, Player, InteractionHand, Boolean> applyEffect
}

public UltimaTool(int cooldown, Function3<Level, Player, InteractionHand, Boolean> applyEffect, BiFunction<LivingEntity, Player, Boolean> hitEntity) {
super(new Item.Properties().stacksTo(1).durability(cooldown).tab(SkyblockUltimaTools.TAB));
super(new Item.Properties().stacksTo(1).durability(cooldown));
this.cooldown = cooldown;
this.applyEffect = applyEffect;
this.applyBlock = null;
Expand All @@ -66,7 +65,7 @@ public UltimaTool(BiFunction<LivingEntity, Player, Boolean> hitEntity) {
}

public UltimaTool(int cooldown, BiFunction<LivingEntity, Player, Boolean> hitEntity) {
super(new Item.Properties().stacksTo(1).durability(cooldown).tab(SkyblockUltimaTools.TAB));
super(new Item.Properties().stacksTo(1).durability(cooldown));
this.cooldown = cooldown;
this.applyEffect = null;
this.applyBlock = null;
Expand All @@ -78,7 +77,7 @@ public UltimaTool(Function5<Level, Player, InteractionHand, BlockPos, Direction,
}

public UltimaTool(int cooldown, Function5<Level, Player, InteractionHand, BlockPos, Direction, Boolean> applyBlock, BiFunction<LivingEntity, Player, Boolean> hitEntity) {
super(new Item.Properties().stacksTo(1).durability(cooldown).tab(SkyblockUltimaTools.TAB));
super(new Item.Properties().stacksTo(1).durability(cooldown));
this.cooldown = cooldown;
this.applyEffect = null;
this.applyBlock = applyBlock;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/de/melanx/ultimatools/util/ToolEffects.java
Expand Up @@ -6,8 +6,8 @@
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
Expand Down Expand Up @@ -165,7 +165,7 @@ public static Function5<Level, Player, InteractionHand, BlockPos, Direction, Boo
public static Function5<Level, Player, InteractionHand, BlockPos, Direction, Boolean> changeBlock(TagKey<Block> from, BlockState to) {
Predicate<Block> predicate = block -> {
//noinspection deprecation
for (Holder<Block> holder : Registry.BLOCK.getTagOrEmpty(from)) {
for (Holder<Block> holder : BuiltInRegistries.BLOCK.getTagOrEmpty(from)) {
if (block == holder.value()) {
return true;
}
Expand Down Expand Up @@ -289,7 +289,7 @@ public static boolean removeFluid(Level level, Player player, InteractionHand ha
private static Block getRandomBlock(TagKey<Block> key) {
List<Block> blocks = Lists.newArrayList();
//noinspection deprecation
for (Holder<Block> holder : Registry.BLOCK.getTagOrEmpty(key)) {
for (Holder<Block> holder : BuiltInRegistries.BLOCK.getTagOrEmpty(key)) {
blocks.add(holder.value());
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[42,)"
loaderVersion="[44,)"
issueTrackerURL="https://github.com/MelanX/ultimatools/issues/"
license="MIT License"

Expand All @@ -14,13 +14,13 @@ authors="MelanX"
[[dependencies.ultimatools]]
modId="forge"
mandatory=true
versionRange="[42,)"
versionRange="[44,)"
ordering="NONE"
side="BOTH"

[[dependencies.ultimatools]]
modId="minecraft"
mandatory=true
versionRange="[1.19.1, 1.20)"
versionRange="[1.19.3, 1.20)"
ordering="NONE"
side="BOTH"
4 changes: 2 additions & 2 deletions src/main/resources/pack.mcmeta
@@ -1,8 +1,8 @@
{
"pack": {
"description": "Skyblock Ultima Tools resources",
"pack_format": 10,
"pack_format": 12,
"forge:data_pack_format": 10,
"forge:resource_pack_format": 9
"forge:resource_pack_format": 12
}
}

0 comments on commit e410dca

Please sign in to comment.