Skip to content

Commit 5ff0a28

Browse files
rubensworksrubensworks
committed
Update to MC 1.21.11
1 parent fc77fed commit 5ff0a28

19 files changed

+52
-56
lines changed

‎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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ group=org.cyclops.integratedscripting
44
java_version=21
55

66
# Common
7-
minecraft_version=1.21.10
7+
minecraft_version=1.21.11
88
mod_name=IntegratedScripting
99
mod_author=rubensworks (aka kroeser)
1010
mod_id=integratedscripting
@@ -21,7 +21,7 @@ curseforge_project_id=889785
2121
modrinth_project_id=uDJkuFRe
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-scripting.json
2727

@@ -32,6 +32,6 @@ org.gradle.caching=true
3232

3333
# Dependencies
3434
graal_version=24.1.1
35-
cyclopscore_version=1.25.5-858
36-
integrateddynamics_version=1.24.1-1417
37-
commoncapabilities_version=2.9.7-299
35+
cyclopscore_version=1.25.5-871
36+
integrateddynamics_version=1.24.1-1419
37+
commoncapabilities_version=2.9.7-303

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

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

3-
import net.minecraft.resources.ResourceLocation;
3+
import net.minecraft.resources.Identifier;
44
import org.cyclops.integrateddynamics.api.network.NetworkCapability;
55
import org.cyclops.integratedscripting.api.network.IScriptingNetwork;
66

@@ -9,6 +9,6 @@
99
*/
1010
public class Capabilities {
1111
public static final class ScriptingNetwork {
12-
public static final NetworkCapability<IScriptingNetwork> NETWORK = NetworkCapability.create(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "scripting_network"), IScriptingNetwork.class);
12+
public static final NetworkCapability<IScriptingNetwork> NETWORK = NetworkCapability.create(Identifier.fromNamespaceAndPath(Reference.MOD_ID, "scripting_network"), IScriptingNetwork.class);
1313
}
1414
}

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

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

33
import net.minecraft.core.component.DataComponentType;
44
import net.minecraft.core.registries.Registries;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66
import net.minecraft.world.inventory.MenuType;
77
import net.minecraft.world.item.Item;
88
import net.minecraft.world.level.block.Block;
@@ -18,15 +18,15 @@
1818
* @author rubensworks
1919
*/
2020
public class RegistryEntries {
21-
public static final DeferredHolder<Item, ItemScriptingDisk> ITEM_SCRIPTING_DISK = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("integratedscripting:scripting_disk"));
21+
public static final DeferredHolder<Item, ItemScriptingDisk> ITEM_SCRIPTING_DISK = DeferredHolder.create(Registries.ITEM, Identifier.parse("integratedscripting:scripting_disk"));
2222

23-
public static final DeferredHolder<Block, Block> BLOCK_SCRIPTING_DRIVE = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("integratedscripting:scripting_drive"));
24-
public static final DeferredHolder<Block, Block> BLOCK_PART_TERMINAL_SCRIPTING = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("integratedscripting:part_terminal_scripting"));
23+
public static final DeferredHolder<Block, Block> BLOCK_SCRIPTING_DRIVE = DeferredHolder.create(Registries.BLOCK, Identifier.parse("integratedscripting:scripting_drive"));
24+
public static final DeferredHolder<Block, Block> BLOCK_PART_TERMINAL_SCRIPTING = DeferredHolder.create(Registries.BLOCK, Identifier.parse("integratedscripting:part_terminal_scripting"));
2525

26-
public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<BlockEntityVariablestore>> BLOCK_ENTITY_SCRIPTING_DRIVE = DeferredHolder.create(Registries.BLOCK_ENTITY_TYPE, ResourceLocation.parse("integratedscripting:scripting_drive"));
26+
public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<BlockEntityVariablestore>> BLOCK_ENTITY_SCRIPTING_DRIVE = DeferredHolder.create(Registries.BLOCK_ENTITY_TYPE, Identifier.parse("integratedscripting:scripting_drive"));
2727

28-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerScriptingDrive>> CONTAINER_SCRIPTING_DRIVE = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedscripting:scripting_drive"));
29-
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalScripting>> CONTAINER_TERMINAL_SCRIPTING = DeferredHolder.create(Registries.MENU, ResourceLocation.parse("integratedscripting:part_terminal_scripting"));
28+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerScriptingDrive>> CONTAINER_SCRIPTING_DRIVE = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedscripting:scripting_drive"));
29+
public static final DeferredHolder<MenuType<?>, MenuType<ContainerTerminalScripting>> CONTAINER_TERMINAL_SCRIPTING = DeferredHolder.create(Registries.MENU, Identifier.parse("integratedscripting:part_terminal_scripting"));
3030

31-
public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> DATACOMPONENT_DISK_ID = DeferredHolder.create(Registries.DATA_COMPONENT_TYPE, ResourceLocation.parse("integratedscripting:disk_id"));
31+
public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> DATACOMPONENT_DISK_ID = DeferredHolder.create(Registries.DATA_COMPONENT_TYPE, Identifier.parse("integratedscripting:disk_id"));
3232
}

‎src/main/java/org/cyclops/integratedscripting/client/gui/component/input/WidgetDialog.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import net.minecraft.client.input.MouseButtonEvent;
1212
import net.minecraft.client.renderer.RenderPipelines;
1313
import net.minecraft.network.chat.Component;
14-
import net.minecraft.resources.ResourceLocation;
14+
import net.minecraft.resources.Identifier;
1515
import net.minecraft.util.ARGB;
1616
import net.minecraft.util.FormattedCharSequence;
1717
import org.cyclops.cyclopscore.client.gui.component.button.ButtonText;
@@ -24,7 +24,7 @@
2424
*/
2525
public class WidgetDialog extends AbstractWidget implements GuiEventListener {
2626

27-
private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/dialog.png");
27+
private static final Identifier TEXTURE = Identifier.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/dialog.png");
2828
public static final int WIDTH = 216;
2929
private static final int HEIGHT = 71;
3030

‎src/main/java/org/cyclops/integratedscripting/client/gui/component/input/WidgetTextArea.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.common.collect.Lists;
44
import it.unimi.dsi.fastutil.ints.IntArrayList;
55
import it.unimi.dsi.fastutil.ints.IntList;
6-
import net.minecraft.Util;
6+
import net.minecraft.util.Util;
77
import net.minecraft.client.Minecraft;
88
import net.minecraft.client.StringSplitter;
99
import net.minecraft.client.gui.Font;

‎src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenScriptingDrive.java‎

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

33
import net.minecraft.client.gui.GuiGraphics;
44
import net.minecraft.network.chat.Component;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66
import net.minecraft.util.ARGB;
77
import net.minecraft.world.entity.player.Inventory;
88
import org.cyclops.cyclopscore.client.gui.container.ContainerScreenExtended;
@@ -20,8 +20,8 @@ public ContainerScreenScriptingDrive(ContainerScriptingDrive container, Inventor
2020
}
2121

2222
@Override
23-
protected ResourceLocation constructGuiTexture() {
24-
return ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/scripting_drive.png");
23+
protected Identifier constructGuiTexture() {
24+
return Identifier.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/scripting_drive.png");
2525
}
2626

2727
@Override

‎src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenTerminalScripting.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import net.minecraft.client.input.MouseButtonEvent;
1313
import net.minecraft.client.resources.sounds.SimpleSoundInstance;
1414
import net.minecraft.network.chat.Component;
15-
import net.minecraft.resources.ResourceLocation;
15+
import net.minecraft.resources.Identifier;
1616
import net.minecraft.sounds.SoundEvents;
1717
import net.minecraft.util.ARGB;
1818
import net.minecraft.util.StringUtil;
@@ -168,8 +168,8 @@ public void onClose() {
168168
}
169169

170170
@Override
171-
protected ResourceLocation constructGuiTexture() {
172-
return ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/scripting_terminal.png");
171+
protected Identifier constructGuiTexture() {
172+
return Identifier.fromNamespaceAndPath(Reference.MOD_ID, "textures/gui/scripting_terminal.png");
173173
}
174174

175175
@Override

‎src/main/java/org/cyclops/integratedscripting/client/gui/image/ScriptImages.java‎

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

3-
import net.minecraft.resources.ResourceLocation;
3+
import net.minecraft.resources.Identifier;
44
import org.cyclops.cyclopscore.client.gui.image.Image;
55
import org.cyclops.cyclopscore.init.ModBaseNeoForge;
66
import org.cyclops.integratedscripting.IntegratedScripting;
@@ -10,7 +10,7 @@
1010
*/
1111
public class ScriptImages {
1212

13-
public static final ResourceLocation ICONS = ResourceLocation.fromNamespaceAndPath(IntegratedScripting._instance.getModId(),
13+
public static final Identifier ICONS = Identifier.fromNamespaceAndPath(IntegratedScripting._instance.getModId(),
1414
IntegratedScripting._instance.getReferenceValue(ModBaseNeoForge.REFKEY_TEXTURE_PATH_GUI) + "icons.png");
1515

1616
public static final Image FILE_OTHER = new Image(ICONS, 0, 0, 12, 12);

‎src/main/java/org/cyclops/integratedscripting/command/CommandTestScript.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
import net.minecraft.world.item.Items;
1212
import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
1313
import org.cyclops.integrateddynamics.api.evaluate.variable.ValueDeseralizationContext;
14-
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueObjectTypeItemStack;
15-
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueTypeBoolean;
16-
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueTypeInteger;
17-
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueTypeList;
18-
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueTypeNbt;
14+
import org.cyclops.integrateddynamics.core.evaluate.variable.*;
1915
import org.cyclops.integratedscripting.api.evaluate.translation.IEvaluationExceptionFactory;
2016
import org.cyclops.integratedscripting.evaluate.ScriptHelpers;
2117
import org.cyclops.integratedscripting.evaluate.translation.ValueTranslators;
@@ -97,7 +93,7 @@ function testFunction(a, b, c, d, e, f) {
9793

9894
public static LiteralArgumentBuilder<CommandSourceStack> make() {
9995
return Commands.literal("testscript")
100-
.requires((commandSource) -> commandSource.hasPermission(2))
96+
.requires(Commands.hasPermission(Commands.LEVEL_GAMEMASTERS))
10197
.executes(new CommandTestScript());
10298
}
10399

0 commit comments

Comments
 (0)