Skip to content

Commit a88d4ad

Browse files
rubensworksrubensworks
committed
Update to MC 1.21.11
1 parent 620c866 commit a88d4ad

61 files changed

Lines changed: 186 additions & 191 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'net.neoforged.moddev' version '2.0.119'
2+
id 'net.neoforged.moddev' version '2.0.126'
33
id 'net.darkhax.curseforgegradle' version '1.1.28'
44
id 'com.github.kt3k.coveralls' version '2.12.0'
55
id 'com.diffplug.spotless' version '6.25.0'

‎gradle.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ group=org.cyclops.integratedterminals
44
java_version=21
55

66
# Common
7-
minecraft_version=1.21.10
7+
minecraft_version=1.21.11
88
mod_name=IntegratedTerminals
99
mod_author=rubensworks (aka kroeser)
1010
mod_id=integratedterminals
@@ -21,7 +21,7 @@ curseforge_project_id=295910
2121
modrinth_project_id=HmLJoQ1K
2222

2323
# NeoForge
24-
neoforge_version=21.10.53-beta
24+
neoforge_version=21.11.10-beta
2525
neoforge_loader_version_range=[4,)
2626
neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/integrated-terminals.json
2727

@@ -31,8 +31,8 @@ org.gradle.daemon=false
3131
org.gradle.caching=true
3232

3333
# Dependencies
34-
cyclopscore_version=1.25.5-863
35-
integrateddynamics_version=1.24.1-1417
34+
cyclopscore_version=1.25.5-871
35+
integrateddynamics_version=1.24.1-1419
3636
integratedterminalscompat_version=1.0.0-137
37-
integratedcrafting_version=1.1.13-408
38-
commoncapabilities_version=2.9.7-299
37+
integratedcrafting_version=1.1.13-412
38+
commoncapabilities_version=2.9.7-303

‎src/main/java/org/cyclops/integratedterminals/Capabilities.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.cyclops.integratedterminals;
22

3-
import net.minecraft.resources.ResourceLocation;
3+
import net.minecraft.resources.Identifier;
44
import org.cyclops.commoncapabilities.api.ingredient.capability.IngredientComponentCapability;
55
import org.cyclops.integratedterminals.api.ingredient.IIngredientComponentTerminalStorageHandler;
66

@@ -10,6 +10,6 @@
1010
*/
1111
public class Capabilities {
1212
public static final class IngredientComponentTerminalStorageHandler {
13-
public static final IngredientComponentCapability<IIngredientComponentTerminalStorageHandler, Void> INGREDIENT = IngredientComponentCapability.createVoid(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "terminal_storage_handler"), IIngredientComponentTerminalStorageHandler.class);
13+
public static final IngredientComponentCapability<IIngredientComponentTerminalStorageHandler, Void> INGREDIENT = IngredientComponentCapability.createVoid(Identifier.fromNamespaceAndPath(Reference.MOD_ID, "terminal_storage_handler"), IIngredientComponentTerminalStorageHandler.class);
1414
}
1515
}

‎src/main/java/org/cyclops/integratedterminals/RegistryEntries.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import net.minecraft.core.component.DataComponentType;
44
import net.minecraft.core.registries.Registries;
55
import net.minecraft.nbt.CompoundTag;
6-
import net.minecraft.resources.ResourceLocation;
6+
import net.minecraft.resources.Identifier;
77
import net.minecraft.world.inventory.MenuType;
88
import net.minecraft.world.item.Item;
99
import net.neoforged.neoforge.registries.DeferredHolder;
@@ -23,20 +23,20 @@
2323
*/
2424
public class RegistryEntries {
2525

26-
public static final DeferredHolder<Item, Item> ITEM_PART_TERMINAL_STORAGE = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("integratedterminals:part_terminal_storage"));
27-
public static final DeferredHolder<Item, ItemBlockEnergyContainer> ITEM_ENERGY_BATTERY = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("integrateddynamics:energy_battery"));
28-
public static final DeferredHolder<Item, Item> ITEM_TERMINAL_STORAGE_PORTABLE = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("integratedterminals:terminal_storage_portable"));
26+
public static final DeferredHolder<Item, Item> ITEM_PART_TERMINAL_STORAGE = DeferredHolder.create(Registries.ITEM, Identifier.parse("integratedterminals:part_terminal_storage"));
27+
public static final DeferredHolder<Item, ItemBlockEnergyContainer> ITEM_ENERGY_BATTERY = DeferredHolder.create(Registries.ITEM, Identifier.parse("integrateddynamics:energy_battery"));
28+
public static final DeferredHolder<Item, Item> ITEM_TERMINAL_STORAGE_PORTABLE = DeferredHolder.create(Registries.ITEM, Identifier.parse("integratedterminals:terminal_storage_portable"));
2929

30-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalCraftingJobs>> CONTAINER_PART_TERMINAL_CRAFTING_JOBS = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedterminals:part_terminal_crafting_jobs"));
31-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalCraftingJobsPlan>> CONTAINER_PART_TERMINAL_CRAFTING_JOBS_PLAN = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedterminals:part_terminal_crafting_jobs_plan"));
32-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStoragePart>> CONTAINER_PART_TERMINAL_STORAGE_PART = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedterminals:part_terminal_storage_part"));
33-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageCraftingOptionAmountPart>> CONTAINER_PART_TERMINAL_STORAGE_CRAFTING_OPTION_AMOUNT_PART = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedterminals:part_terminal_storage_crafting_option_amount_part"));
34-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageCraftingPlanPart>> CONTAINER_PART_TERMINAL_STORAGE_CRAFTING_PLAN_PART = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedterminals:part_terminal_storage_crafting_plan_part"));
35-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageItem>> CONTAINER_PART_TERMINAL_STORAGE_ITEM = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedterminals:part_terminal_storage_item"));
36-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageCraftingOptionAmountItem>> CONTAINER_PART_TERMINAL_STORAGE_CRAFTING_OPTION_AMOUNT_ITEM = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedterminals:part_terminal_storage_crafting_option_amount_item"));
37-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageCraftingPlanItem>> CONTAINER_PART_TERMINAL_STORAGE_CRAFTING_PLAN_ITEM = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedterminals:part_terminal_storage_crafting_plan_item"));
30+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalCraftingJobs>> CONTAINER_PART_TERMINAL_CRAFTING_JOBS = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedterminals:part_terminal_crafting_jobs"));
31+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalCraftingJobsPlan>> CONTAINER_PART_TERMINAL_CRAFTING_JOBS_PLAN = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedterminals:part_terminal_crafting_jobs_plan"));
32+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStoragePart>> CONTAINER_PART_TERMINAL_STORAGE_PART = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedterminals:part_terminal_storage_part"));
33+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageCraftingOptionAmountPart>> CONTAINER_PART_TERMINAL_STORAGE_CRAFTING_OPTION_AMOUNT_PART = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedterminals:part_terminal_storage_crafting_option_amount_part"));
34+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageCraftingPlanPart>> CONTAINER_PART_TERMINAL_STORAGE_CRAFTING_PLAN_PART = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedterminals:part_terminal_storage_crafting_plan_part"));
35+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageItem>> CONTAINER_PART_TERMINAL_STORAGE_ITEM = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedterminals:part_terminal_storage_item"));
36+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageCraftingOptionAmountItem>> CONTAINER_PART_TERMINAL_STORAGE_CRAFTING_OPTION_AMOUNT_ITEM = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedterminals:part_terminal_storage_crafting_option_amount_item"));
37+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalStorageCraftingPlanItem>> CONTAINER_PART_TERMINAL_STORAGE_CRAFTING_PLAN_ITEM = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedterminals:part_terminal_storage_crafting_plan_item"));
3838

39-
public static final DeferredHolder<DataComponentType<?>, DataComponentType<CompoundTag>> COMPONENT_TERMINAL_STORAGE_INVENTORIES = DeferredHolder.create(Registries.DATA_COMPONENT_TYPE, ResourceLocation.parse("integratedterminals:terminal_storage_inventories"));
40-
public static final DeferredHolder<DataComponentType<?>, DataComponentType<CompoundTag>> COMPONENT_TERMINAL_STORAGE_STATE = DeferredHolder.create(Registries.DATA_COMPONENT_TYPE, ResourceLocation.parse("integratedterminals:terminal_storage_state"));
39+
public static final DeferredHolder<DataComponentType<?>, DataComponentType<CompoundTag>> COMPONENT_TERMINAL_STORAGE_INVENTORIES = DeferredHolder.create(Registries.DATA_COMPONENT_TYPE, Identifier.parse("integratedterminals:terminal_storage_inventories"));
40+
public static final DeferredHolder<DataComponentType<?>, DataComponentType<CompoundTag>> COMPONENT_TERMINAL_STORAGE_STATE = DeferredHolder.create(Registries.DATA_COMPONENT_TYPE, Identifier.parse("integratedterminals:terminal_storage_state"));
4141

4242
}

‎src/main/java/org/cyclops/integratedterminals/api/terminalstorage/ITerminalStorageTab.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.cyclops.integratedterminals.api.terminalstorage;
22

33
import net.minecraft.world.entity.player.Player;
4-
import net.minecraft.resources.ResourceLocation;
4+
import net.minecraft.resources.Identifier;
55
import org.cyclops.integrateddynamics.api.network.INetwork;
66
import org.cyclops.integratedterminals.inventory.container.ContainerTerminalStorageBase;
77

@@ -16,7 +16,7 @@ public interface ITerminalStorageTab {
1616
/**
1717
* @return The unique name of this tab.
1818
*/
19-
public ResourceLocation getName();
19+
public Identifier getName();
2020

2121
/**
2222
* @param container The container in which the tab is about to be created.

‎src/main/java/org/cyclops/integratedterminals/api/terminalstorage/ITerminalStorageTabClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import net.minecraft.client.gui.GuiGraphics;
44
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
55
import net.minecraft.network.chat.Component;
6-
import net.minecraft.resources.ResourceLocation;
6+
import net.minecraft.resources.Identifier;
77
import net.minecraft.world.inventory.AbstractContainerMenu;
88
import net.minecraft.world.inventory.Slot;
99
import net.minecraft.world.item.ItemStack;
@@ -40,13 +40,13 @@ public interface ITerminalStorageTabClient<S extends ITerminalStorageSlot> {
4040
/**
4141
* @return The unique tab name, as inherited from {@link ITerminalStorageTab#getName()}.
4242
*/
43-
public ResourceLocation getName();
43+
public Identifier getName();
4444

4545
/**
4646
* @return The tab name that will be used to store {@link TerminalStorageState} settings inside a tab.
4747
* This can be used to modify in what tab certain settings are stored.
4848
*/
49-
public default ResourceLocation getTabSettingsName() {
49+
public default Identifier getTabSettingsName() {
5050
return getName();
5151
}
5252

@@ -213,7 +213,7 @@ public default int getPlayerInventoryOffsetY() {
213213
* @return An optional alternative background texture that should be used when rendering the gui of the tab.
214214
*/
215215
@Nullable
216-
public default ResourceLocation getBackgroundTexture() {
216+
public default Identifier getBackgroundTexture() {
217217
return null;
218218
}
219219

‎src/main/java/org/cyclops/integratedterminals/api/terminalstorage/ITerminalStorageTabCommon.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.minecraft.core.HolderLookup;
44
import net.minecraft.core.NonNullList;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66
import net.minecraft.world.Container;
77
import net.minecraft.world.entity.player.Player;
88
import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -25,7 +25,7 @@ public interface ITerminalStorageTabCommon {
2525
/**
2626
* @return The unique tab name, as inherited from {@link ITerminalStorageTab#getName()}.
2727
*/
28-
public ResourceLocation getName();
28+
public Identifier getName();
2929

3030
public default List<Pair<Slot, ISlotPositionCallback>> loadSlots(AbstractContainerMenu container, int startIndex, Player player,
3131
Optional<IVariableInventory> variableInventory, ValueDeseralizationContext valueDeseralizationContext) {

‎src/main/java/org/cyclops/integratedterminals/api/terminalstorage/ITerminalStorageTabRegistry.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.cyclops.integratedterminals.api.terminalstorage;
22

3-
import net.minecraft.resources.ResourceLocation;
3+
import net.minecraft.resources.Identifier;
44
import org.cyclops.cyclopscore.init.IRegistry;
55

66
import javax.annotation.Nullable;
@@ -26,7 +26,7 @@ public interface ITerminalStorageTabRegistry extends IRegistry {
2626
* @return The registered tab or null.
2727
*/
2828
@Nullable
29-
public ITerminalStorageTab getTab(ResourceLocation name);
29+
public ITerminalStorageTab getTab(Identifier name);
3030

3131
/**
3232
* @return All registered tabs.

‎src/main/java/org/cyclops/integratedterminals/api/terminalstorage/ITerminalStorageTabServer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.cyclops.integratedterminals.api.terminalstorage;
22

3-
import net.minecraft.resources.ResourceLocation;
3+
import net.minecraft.resources.Identifier;
44

55
/**
66
* A server-side terminal storage tab.
@@ -11,7 +11,7 @@ public interface ITerminalStorageTabServer {
1111
/**
1212
* @return The unique tab name, as inherited from {@link ITerminalStorageTab#getName()}.
1313
*/
14-
public ResourceLocation getName();
14+
public Identifier getName();
1515

1616
/**
1717
* Initializes the tab when the container was opened.

‎src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/ITerminalStorageTabIngredientCraftingHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.mojang.logging.LogUtils;
44
import net.minecraft.nbt.CompoundTag;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66
import net.minecraft.server.level.ServerPlayer;
77
import net.minecraft.util.ProblemReporter;
88
import net.minecraft.world.level.storage.TagValueOutput;
@@ -31,7 +31,7 @@ public interface ITerminalStorageTabIngredientCraftingHandler<O extends ITermina
3131
/**
3232
* @return The unique id of this handler.
3333
*/
34-
public ResourceLocation getId();
34+
public Identifier getId();
3535

3636
/**
3737
* @param tab An ingredient tab.

0 commit comments

Comments
 (0)