Skip to content

Commit 1193fae

Browse files
MrCrayfishMrCrayfish
committed
📦 Working on 1.21.11
1 parent f0869c0 commit 1193fae

Some content is hidden

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

53 files changed

+314
-227
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ build
2121
# other
2222
eclipse
2323
/fabric/run/
24+
/neoforge/run/
2425
/neoforge/runs/
26+
/neoforge/logs/
2527
/forge/

‎build.gradle‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
buildscript {
2+
dependencies {
3+
classpath "commons-io:commons-io:2.20.0"
4+
}
5+
}
6+
17
plugins {
28
id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
3-
id 'fabric-loom' version '1.11-SNAPSHOT' apply false
4-
id 'net.neoforged.gradle.userdev' version '7.0.192' apply false
5-
id 'net.neoforged.moddev' version '2.0.111' apply false
9+
id 'fabric-loom' version '1.14-SNAPSHOT' apply false
10+
id 'net.neoforged.moddev' version '2.0.123' apply false
611
}

‎buildSrc/src/main/groovy/multiloader-common.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ repositories {
5151
}
5252
}
5353
}
54-
if (System.getenv("LOCAL_MAVEN")) {
54+
/* if (System.getenv("LOCAL_MAVEN")) {
5555
maven {
5656
url "file://" + System.getenv("LOCAL_MAVEN")
5757
}
58-
}
58+
}*/
5959
maven {
6060
name = 'BlameJared'
6161
url = 'https://maven.blamejared.com'
@@ -83,8 +83,7 @@ configurations {
8383
// Read more about capabilities here: https://docs.gradle.org/current/userguide/component_capabilities.html#sec:declaring-additional-capabilities-for-a-local-component
8484
['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant ->
8585
configurations."$variant".outgoing {
86-
capability("$group:${base.archivesName.get()}:$version")
87-
capability("$group:$mod_id-${project.name}-${minecraft_version}:$version")
86+
capability("$group:$mod_id-${project.name}:$version")
8887
capability("$group:$mod_id:$version")
8988
}
9089
publishing.publications.configureEach {

‎buildSrc/src/main/groovy/multiloader-loader.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ dependencies {
1616
capabilities {
1717
requireCapability "$group:$mod_id"
1818
}
19+
def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String)
20+
attributes {
21+
attribute(loaderAttribute, 'common')
22+
}
1923
}
2024
commonJava project(path: ':common', configuration: 'commonJava')
2125
commonResources project(path: ':common', configuration: 'commonResources')

‎common/build.gradle‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ dependencies {
2323
compileOnly "com.mrcrayfish:controllable-sdl:${controllable_sdl_version}"
2424
compileOnly "dev.emi:emi-xplat-mojmap:${emi_version}"
2525
compileOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rei_version}"
26-
compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.7'
27-
compileOnly group: 'io.github.llamalad7', name: 'mixinextras-common', version: '0.4.1'
28-
annotationProcessor group: 'io.github.llamalad7', name: 'mixinextras-common', version: '0.4.1'
26+
compileOnly "org.spongepowered:mixin:0.8.7"
27+
compileOnly "io.github.llamalad7:mixinextras-common:0.5.0"
28+
annotationProcessor "io.github.llamalad7:mixinextras-common:0.5.0"
2929
}
3030

3131
tasks.register('downloadMappings', Download) {
@@ -47,4 +47,23 @@ configurations {
4747
artifacts {
4848
commonJava sourceSets.main.java.sourceDirectories.singleFile
4949
commonResources sourceSets.main.resources.sourceDirectories.singleFile
50+
}
51+
52+
// Implement mcgradleconventions loader attribute
53+
def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String)
54+
['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant ->
55+
configurations.named("$variant") {
56+
attributes {
57+
attribute(loaderAttribute, 'common')
58+
}
59+
}
60+
}
61+
sourceSets.configureEach {
62+
[it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName].each { variant->
63+
configurations.named("$variant") {
64+
attributes {
65+
attribute(loaderAttribute, 'common')
66+
}
67+
}
68+
}
5069
}

‎common/src/main/java/com/mrcrayfish/controllable/Config.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
import com.mrcrayfish.framework.api.config.DoubleProperty;
1414
import com.mrcrayfish.framework.api.config.EnumProperty;
1515
import com.mrcrayfish.framework.api.config.FrameworkConfig;
16-
import net.minecraft.resources.ResourceLocation;
16+
import net.minecraft.resources.Identifier;
1717

1818
/**
1919
* Author: MrCrayfish
2020
*/
2121
public class Config
2222
{
23-
public static final ResourceLocation CLIENT_CONFIG_ID = Utils.resource("client");
23+
public static final Identifier CLIENT_CONFIG_ID = Utils.resource("client");
2424

2525
@FrameworkConfig(id = Constants.MOD_ID, name = "client", separator = '-', type = ConfigType.CLIENT)
2626
public static final Client CLIENT = new Client();

‎common/src/main/java/com/mrcrayfish/controllable/client/InputHandler.java‎

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,10 @@
88
import com.mrcrayfish.controllable.client.binding.ButtonBinding;
99
import com.mrcrayfish.controllable.client.binding.ButtonBindings;
1010
import com.mrcrayfish.controllable.client.binding.handlers.ButtonHandler;
11-
import com.mrcrayfish.controllable.client.binding.handlers.action.BindingMovementInput;
12-
import com.mrcrayfish.controllable.client.binding.handlers.action.BindingOnRender;
13-
import com.mrcrayfish.controllable.client.binding.handlers.action.BindingOnTick;
14-
import com.mrcrayfish.controllable.client.binding.handlers.action.BindingPressed;
15-
import com.mrcrayfish.controllable.client.binding.handlers.action.BindingReleased;
11+
import com.mrcrayfish.controllable.client.binding.handlers.action.*;
1612
import com.mrcrayfish.controllable.client.binding.handlers.action.context.Context;
1713
import com.mrcrayfish.controllable.client.binding.handlers.action.context.MovementInputContext;
18-
import com.mrcrayfish.controllable.client.gui.navigation.BasicNavigationPoint;
19-
import com.mrcrayfish.controllable.client.gui.navigation.ListEntryNavigationPoint;
20-
import com.mrcrayfish.controllable.client.gui.navigation.ListWidgetNavigationPoint;
21-
import com.mrcrayfish.controllable.client.gui.navigation.Navigatable;
22-
import com.mrcrayfish.controllable.client.gui.navigation.NavigationPoint;
23-
import com.mrcrayfish.controllable.client.gui.navigation.SkipItem;
24-
import com.mrcrayfish.controllable.client.gui.navigation.SlotNavigationPoint;
25-
import com.mrcrayfish.controllable.client.gui.navigation.WidgetNavigationPoint;
14+
import com.mrcrayfish.controllable.client.gui.navigation.*;
2615
import com.mrcrayfish.controllable.client.input.Controller;
2716
import com.mrcrayfish.controllable.client.settings.AnalogMovement;
2817
import com.mrcrayfish.controllable.client.settings.Thumbstick;
@@ -40,55 +29,30 @@
4029
import com.mrcrayfish.framework.api.event.client.FrameworkInputEvents;
4130
import net.minecraft.client.CameraType;
4231
import net.minecraft.client.Minecraft;
43-
import net.minecraft.client.gui.components.AbstractSelectionList;
44-
import net.minecraft.client.gui.components.AbstractWidget;
45-
import net.minecraft.client.gui.components.Button;
46-
import net.minecraft.client.gui.components.ImageButton;
47-
import net.minecraft.client.gui.components.TabButton;
32+
import net.minecraft.client.gui.components.*;
4833
import net.minecraft.client.gui.components.events.ContainerEventHandler;
4934
import net.minecraft.client.gui.components.events.GuiEventListener;
5035
import net.minecraft.client.gui.components.tabs.TabNavigationBar;
5136
import net.minecraft.client.gui.screens.Screen;
52-
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
53-
import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
54-
import net.minecraft.client.gui.screens.inventory.EnchantmentScreen;
55-
import net.minecraft.client.gui.screens.inventory.LoomScreen;
56-
import net.minecraft.client.gui.screens.inventory.StonecutterScreen;
57-
import net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent;
58-
import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
59-
import net.minecraft.client.gui.screens.recipebook.RecipeBookPage;
60-
import net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton;
61-
import net.minecraft.client.gui.screens.recipebook.RecipeButton;
62-
import net.minecraft.client.gui.screens.recipebook.RecipeUpdateListener;
37+
import net.minecraft.client.gui.screens.inventory.*;
38+
import net.minecraft.client.gui.screens.recipebook.*;
6339
import net.minecraft.client.input.MouseButtonInfo;
6440
import net.minecraft.client.multiplayer.ServerData;
6541
import net.minecraft.client.player.ClientInput;
6642
import net.minecraft.client.player.LocalPlayer;
6743
import net.minecraft.client.resources.sounds.SimpleSoundInstance;
6844
import net.minecraft.core.Holder;
6945
import net.minecraft.sounds.SoundEvents;
70-
import net.minecraft.world.entity.ai.attributes.Attributes;
71-
import net.minecraft.world.entity.player.Input;
7246
import net.minecraft.world.entity.player.Player;
73-
import net.minecraft.world.entity.vehicle.AbstractBoat;
74-
import net.minecraft.world.entity.vehicle.Boat;
75-
import net.minecraft.world.inventory.FurnaceResultSlot;
76-
import net.minecraft.world.inventory.RecipeBookMenu;
77-
import net.minecraft.world.inventory.ResultSlot;
78-
import net.minecraft.world.inventory.Slot;
79-
import net.minecraft.world.inventory.StonecutterMenu;
47+
import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
48+
import net.minecraft.world.inventory.*;
8049
import net.minecraft.world.level.block.entity.BannerPattern;
8150
import org.jetbrains.annotations.ApiStatus;
8251
import org.jetbrains.annotations.Nullable;
8352
import org.joml.Vector2d;
8453
import org.lwjgl.glfw.GLFW;
8554

86-
import java.util.ArrayList;
87-
import java.util.Comparator;
88-
import java.util.List;
89-
import java.util.Optional;
90-
import java.util.Set;
91-
import java.util.TreeSet;
55+
import java.util.*;
9256
import java.util.function.BiFunction;
9357

9458
/**
@@ -443,9 +407,9 @@ public static void navigateRecipeTab(Screen screen, int dir)
443407

444408
if(newTab != null)
445409
{
446-
currentTab.setStateTriggered(false);
410+
currentTab.unselect();
447411
accessor.controllableSetCurrentTab(newTab);
448-
newTab.setStateTriggered(true);
412+
newTab.select();
449413
boolean filtering = accessor.controllableIsFiltering();
450414
accessor.controllableUpdateCollections(true, filtering);
451415
Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F));

‎common/src/main/java/com/mrcrayfish/controllable/client/RadialMenu.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
import net.minecraft.client.Minecraft;
2525
import net.minecraft.client.gui.GuiGraphics;
2626
import net.minecraft.client.renderer.RenderPipelines;
27-
import net.minecraft.client.renderer.RenderType;
2827
import net.minecraft.client.resources.sounds.SimpleSoundInstance;
2928
import net.minecraft.network.chat.Component;
30-
import net.minecraft.resources.ResourceLocation;
29+
import net.minecraft.resources.Identifier;
3130
import net.minecraft.sounds.SoundEvent;
3231
import net.minecraft.sounds.SoundEvents;
3332
import net.minecraft.util.ARGB;
@@ -50,7 +49,7 @@
5049
*/
5150
public class RadialMenu
5251
{
53-
private static final ResourceLocation TEXTURE = Utils.resource("textures/gui/controller.png");
52+
private static final Identifier TEXTURE = Utils.resource("textures/gui/controller.png");
5453
private static final int ANIMATE_DURATION = 5;
5554
private static RadialMenu instance;
5655

‎common/src/main/java/com/mrcrayfish/controllable/client/ScrollingHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.mrcrayfish.controllable.client.util.ScreenHelper;
1010
import com.mrcrayfish.framework.api.event.client.FrameworkClientTickEvents;
1111
import com.mrcrayfish.framework.api.event.client.FrameworkScreenEvents;
12-
import net.minecraft.Util;
12+
import net.minecraft.util.Util;
1313
import net.minecraft.client.DeltaTracker;
1414
import net.minecraft.client.Minecraft;
1515
import net.minecraft.client.gui.components.AbstractSelectionList;

‎common/src/main/java/com/mrcrayfish/controllable/client/binding/context/BindingContext.java‎

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

33
import com.google.common.base.Preconditions;
44
import com.mrcrayfish.controllable.client.binding.context.rule.ContextRule;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66

77
import java.util.Collections;
88
import java.util.HashMap;
@@ -26,13 +26,13 @@
2626
*/
2727
public abstract class BindingContext
2828
{
29-
private static final Set<ResourceLocation> REGISTERED_CONTEXTS = Collections.synchronizedSet(new HashSet<>());
29+
private static final Set<Identifier> REGISTERED_CONTEXTS = Collections.synchronizedSet(new HashSet<>());
3030
private static final Map<ConflictKey, Boolean> CONFLICT_CACHE = new HashMap<>();
3131

32-
private final ResourceLocation id;
32+
private final Identifier id;
3333
private Set<ContextRule> rules;
3434

35-
BindingContext(ResourceLocation id)
35+
BindingContext(Identifier id)
3636
{
3737
Preconditions.checkState(REGISTERED_CONTEXTS.add(id), "Duplicate binding context id: %s".formatted(id));
3838
this.id = id;

0 commit comments

Comments
 (0)