Skip to content

Commit 8fb59b0

Browse files
authored
Clean up unused and/or useless mixins (GregTechCEu#3359)
1 parent a2c70d9 commit 8fb59b0

File tree

56 files changed

+172
-509
lines changed

Some content is hidden

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

56 files changed

+172
-509
lines changed

gradle/forge.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
ldlib = "1.0.39"
2+
ldlib = "1.0.40.a"
33
registrate = "MC1.20-1.3.11"
44
configuration = "2.2.0"
55
mixinExtras = "0.5.0-rc.3"

src/main/java/com/gregtechceu/gtceu/api/block/ActiveBlock.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
3131
}
3232

3333
/**
34-
* @deprecated Use {@link BlockState#setValue(Property, Comparable)}
34+
* Use {@link BlockState#setValue(Property, Comparable)}
3535
*/
3636
@ApiStatus.Obsolete(since = "7.0.0")
3737
public BlockState changeActive(BlockState state, boolean active) {
@@ -42,7 +42,7 @@ public BlockState changeActive(BlockState state, boolean active) {
4242
}
4343

4444
/**
45-
* @deprecated Use {@link BlockState#getValue(Property)}
45+
* Use {@link BlockState#getValue(Property)}
4646
*/
4747
@ApiStatus.Obsolete(since = "7.0.0")
4848
public boolean isActive(BlockState state) {

src/main/java/com/gregtechceu/gtceu/api/blockentity/MetaMachineBlockEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ public void setRemoved() {
125125
}
126126

127127
@Override
128-
public void clearRemoved() {
129-
super.clearRemoved();
128+
public void onLoad() {
129+
super.onLoad();
130130
metaMachine.onLoad();
131131
}
132132

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import com.gregtechceu.gtceu.common.valueprovider.MultipliedFloat;
2525
import com.gregtechceu.gtceu.config.ConfigHolder;
2626
import com.gregtechceu.gtceu.core.mixins.IngredientAccessor;
27-
import com.gregtechceu.gtceu.core.mixins.IntersectionIngredientAccessor;
2827
import com.gregtechceu.gtceu.core.mixins.TagValueAccessor;
28+
import com.gregtechceu.gtceu.core.mixins.forge.IntersectionIngredientAccessor;
2929
import com.gregtechceu.gtceu.integration.xei.entry.item.ItemEntryList;
3030
import com.gregtechceu.gtceu.integration.xei.entry.item.ItemStackList;
3131
import com.gregtechceu.gtceu.integration.xei.entry.item.ItemTagList;

src/main/java/com/gregtechceu/gtceu/api/cosmetics/CapeRegistry.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,13 @@ public static Set<ResourceLocation> getUnlockedCapes(UUID uuid) {
155155
}
156156

157157
/**
158-
* Registers a cape.
158+
* Registers a cape.<br>
159+
* use {@link RegisterGTCapesEvent#registerCape(ResourceLocation, ResourceLocation)} instead of calling this
160+
* directly.
159161
*
160162
* @param id An identifier for the cape
161163
* @param texture The full path to the cape's texture in a resource pack
162164
*
163-
* @deprecated use the {@link RegisterGTCapesEvent#registerCape(ResourceLocation, ResourceLocation)}.
164165
* @see RegisterGTCapesEvent#registerCape(ResourceLocation, ResourceLocation)
165166
*/
166167
@ApiStatus.Internal
@@ -169,12 +170,13 @@ public static void registerCape(ResourceLocation id, ResourceLocation texture) {
169170
}
170171

171172
/**
172-
* Registers a cape that will always be unlocked for all players.
173+
* Registers a cape that will always be unlocked for all players.<br>
174+
* use {@link RegisterGTCapesEvent#registerCape(ResourceLocation, ResourceLocation)} instead of calling this
175+
* directly.
173176
*
174177
* @param id An identifier for the cape
175178
* @param texture The full path to the cape's texture in a resource pack
176179
*
177-
* @deprecated use {@link RegisterGTCapesEvent#registerFreeCape(ResourceLocation, ResourceLocation)}.
178180
* @see RegisterGTCapesEvent#registerFreeCape(ResourceLocation, ResourceLocation)
179181
*/
180182
@ApiStatus.Internal

src/main/java/com/gregtechceu/gtceu/api/gui/fancy/ConfiguratorPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.gregtechceu.gtceu.api.gui.fancy;
22

33
import com.gregtechceu.gtceu.api.gui.GuiTextures;
4-
import com.gregtechceu.gtceu.api.gui.widget.ButtonWidget;
54
import com.gregtechceu.gtceu.config.ConfigHolder;
65

76
import com.lowdragmc.lowdraglib.gui.animation.Animation;
87
import com.lowdragmc.lowdraglib.gui.animation.Transform;
98
import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture;
109
import com.lowdragmc.lowdraglib.gui.texture.TextTexture;
1110
import com.lowdragmc.lowdraglib.gui.util.ClickData;
11+
import com.lowdragmc.lowdraglib.gui.widget.ButtonWidget;
1212
import com.lowdragmc.lowdraglib.gui.widget.ImageWidget;
1313
import com.lowdragmc.lowdraglib.gui.widget.Widget;
1414
import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;

src/main/java/com/gregtechceu/gtceu/api/gui/widget/ButtonWidget.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/main/java/com/gregtechceu/gtceu/api/gui/widget/PatternPreviewWidget.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import net.minecraft.world.phys.Vec3;
4343
import net.minecraftforge.api.distmarker.Dist;
4444
import net.minecraftforge.api.distmarker.OnlyIn;
45+
import net.minecraftforge.client.model.data.ModelDataManager;
4546

4647
import com.mojang.blaze3d.systems.RenderSystem;
4748
import com.mojang.blaze3d.vertex.PoseStack;
@@ -51,6 +52,7 @@
5152
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
5253
import me.shedaniel.rei.impl.client.gui.screen.AbstractDisplayViewingScreen;
5354
import org.jetbrains.annotations.NotNull;
55+
import org.jetbrains.annotations.Nullable;
5456
import org.joml.Vector3f;
5557

5658
import java.util.*;
@@ -231,7 +233,14 @@ public static PatternPreviewWidget getPatternWidget(MultiblockMachineDefinition
231233
GTCEu.LOGGER.error("Try to init pattern previews before level load");
232234
throw new IllegalStateException();
233235
}
234-
LEVEL = new TrackedDummyWorld();
236+
LEVEL = new TrackedDummyWorld() {
237+
238+
@SuppressWarnings("UnstableApiUsage")
239+
@Override
240+
public @Nullable ModelDataManager getModelDataManager() {
241+
return getLevel().getModelDataManager();
242+
}
243+
};
235244
}
236245
return new PatternPreviewWidget(controllerDefinition);
237246
}

src/main/java/com/gregtechceu/gtceu/api/gui/widget/PredicatedButtonWidget.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture;
44
import com.lowdragmc.lowdraglib.gui.util.ClickData;
5+
import com.lowdragmc.lowdraglib.gui.widget.ButtonWidget;
56

67
import net.minecraft.network.FriendlyByteBuf;
78
import net.minecraftforge.api.distmarker.Dist;

src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.gregtechceu.gtceu.api.recipe.lookup.GTRecipeLookup;
99
import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI;
1010
import com.gregtechceu.gtceu.api.sound.SoundEntry;
11-
import com.gregtechceu.gtceu.core.mixins.RecipeManagerInvoker;
1211
import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder;
1312
import com.gregtechceu.gtceu.utils.FormattingUtil;
1413

@@ -24,7 +23,6 @@
2423
import net.minecraft.resources.ResourceLocation;
2524
import net.minecraft.world.item.ItemStack;
2625
import net.minecraft.world.item.crafting.Recipe;
27-
import net.minecraft.world.item.crafting.RecipeManager;
2826
import net.minecraft.world.item.crafting.RecipeType;
2927
import net.minecraft.world.item.crafting.SmeltingRecipe;
3028

@@ -189,15 +187,6 @@ public String toString() {
189187
return registryName.toString();
190188
}
191189

192-
@Nullable
193-
public GTRecipe getRecipe(RecipeManager recipeManager, ResourceLocation id) {
194-
var recipes = ((RecipeManagerInvoker) recipeManager).getRecipeFromType(this);
195-
if (recipes.get(id) instanceof GTRecipe recipe) {
196-
return recipe;
197-
}
198-
return null;
199-
}
200-
201190
public @NotNull Iterator<GTRecipe> searchRecipe(IRecipeCapabilityHolder holder, Predicate<GTRecipe> canHandle) {
202191
if (!holder.hasCapabilityProxies()) return Collections.emptyIterator();
203192
var iterator = getLookup().getRecipeIterator(holder, canHandle);

0 commit comments

Comments
 (0)