Skip to content

Commit a2e0357

Browse files
committed
Remove unused stuff
1 parent 46d8dbb commit a2e0357

File tree

7 files changed

+2
-61
lines changed

7 files changed

+2
-61
lines changed

src/client/java/aztech/modern_industrialization/compat/viewer/abstraction/ViewerCategory.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ default void rectangle(Rectangle rectangle, int fillColor) {
143143

144144
void drawable(Consumer<GuiGraphics> widget);
145145

146-
void item(double x, double y, double w, double h, ItemLike item);
147-
148146
void tooltip(int x, int y, int w, int h, List<Component> tooltip);
149147
}
150148

src/client/java/aztech/modern_industrialization/compat/viewer/impl/emi/ViewerCategoryEmi.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import net.minecraft.resources.ResourceLocation;
4747
import net.minecraft.world.item.ItemStack;
4848
import net.minecraft.world.item.crafting.Ingredient;
49-
import net.minecraft.world.level.ItemLike;
5049
import org.jetbrains.annotations.Nullable;
5150

5251
class ViewerCategoryEmi<D> extends EmiRecipeCategory {
@@ -288,20 +287,6 @@ public void drawable(Consumer<GuiGraphics> widget) {
288287
});
289288
}
290289

291-
@Override
292-
public void item(double x, double y, double w, double h, ItemLike item) {
293-
var stack = EmiStack.of(item);
294-
widgets.addDrawable(-4, -4, 0, 0, (guiGraphics, mouseX, mouseY, delta) -> {
295-
guiGraphics.pose().pushPose();
296-
guiGraphics.pose().translate(x, y, 0);
297-
guiGraphics.pose().scale((float) w / 16, (float) h / 16, 0);
298-
299-
stack.render(guiGraphics, 0, 0, delta);
300-
301-
guiGraphics.pose().popPose();
302-
});
303-
}
304-
305290
@Override
306291
public void tooltip(int x, int y, int w, int h, List<Component> tooltip) {
307292
var mapped = tooltip.stream().map(c -> ClientTooltipComponent.create(c.getVisualOrderText())).toList();

src/client/java/aztech/modern_industrialization/compat/viewer/impl/jei/ViewerCategoryJei.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import net.minecraft.resources.ResourceLocation;
5151
import net.minecraft.world.item.ItemStack;
5252
import net.minecraft.world.item.crafting.Ingredient;
53-
import net.minecraft.world.level.ItemLike;
5453
import net.neoforged.neoforge.fluids.FluidType;
5554
import org.jetbrains.annotations.Nullable;
5655

@@ -207,16 +206,6 @@ public void drawable(Consumer<GuiGraphics> widget) {
207206
widget.accept(guiGraphics);
208207
}
209208

210-
@Override
211-
public void item(double x, double y, double w, double h, ItemLike item) {
212-
guiGraphics.pose().pushPose();
213-
var drawable = helpers.getGuiHelper().createDrawableItemLike(item);
214-
guiGraphics.pose().translate(x, y, 0);
215-
guiGraphics.pose().scale((float) w / 16, (float) h / 16, 0);
216-
drawable.draw(guiGraphics);
217-
guiGraphics.pose().popPose();
218-
}
219-
220209
@Override
221210
public void tooltip(int x, int y, int w, int h, List<Component> tooltip) {
222211
}
@@ -255,10 +244,6 @@ public void texture(ResourceLocation loc, int x, int y, int u, int v, int width,
255244
public void drawable(Consumer<GuiGraphics> widget) {
256245
}
257246

258-
@Override
259-
public void item(double x, double y, double w, double h, ItemLike item) {
260-
}
261-
262247
@Override
263248
public void tooltip(int x, int y, int w, int h, List<Component> tooltip) {
264249
if (x <= mouseX && y <= mouseY && mouseX <= x + w && mouseY <= y + h) {

src/client/java/aztech/modern_industrialization/compat/viewer/impl/rei/ViewerCategoryRei.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import net.minecraft.resources.ResourceLocation;
5353
import net.minecraft.world.item.ItemStack;
5454
import net.minecraft.world.item.crafting.Ingredient;
55-
import net.minecraft.world.level.ItemLike;
5655
import org.jetbrains.annotations.Nullable;
5756

5857
class ViewerCategoryRei<D> implements DisplayCategory<ViewerCategoryRei<D>.ViewerDisplay> {
@@ -297,15 +296,6 @@ public void drawable(Consumer<GuiGraphics> widget) {
297296
}));
298297
}
299298

300-
@Override
301-
public void item(double x, double y, double w, double h, ItemLike item) {
302-
widgets.add(Widgets.createSlot(new Rectangle(bounds.x + x, bounds.y + y, w, h))
303-
.entry(EntryStacks.of(item))
304-
.disableTooltips()
305-
.disableHighlight()
306-
.disableBackground());
307-
}
308-
309299
@Override
310300
public void tooltip(int x, int y, int w, int h, List<Component> tooltip) {
311301
widgets.add(Widgets.createDrawableWidget((matrices, reiMouseX, reiMouseY, delta) -> {

src/client/java/aztech/modern_industrialization/compat/viewer/usage/MachineCategory.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@
5454
import net.minecraft.world.item.ItemStack;
5555
import net.minecraft.world.item.crafting.RecipeHolder;
5656
import net.minecraft.world.item.crafting.RecipeManager;
57-
import net.minecraft.world.item.crafting.RecipeType;
58-
import net.minecraft.world.level.block.ComposterBlock;
59-
import net.minecraft.world.level.ItemLike;
6057

6158
public class MachineCategory extends ViewerCategory<RecipeHolder<MachineRecipe>> {
6259
public static MachineCategory create(MachineCategoryParams params) {

src/main/java/aztech/modern_industrialization/machines/recipe/condition/BiomeProcessCondition.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
import net.minecraft.network.codec.ByteBufCodecs;
3838
import net.minecraft.network.codec.StreamCodec;
3939
import net.minecraft.resources.ResourceKey;
40-
import net.minecraft.world.item.ItemStack;
41-
import net.minecraft.world.item.Items;
4240
import net.minecraft.resources.ResourceLocation;
4341
import net.minecraft.tags.TagKey;
42+
import net.minecraft.world.item.ItemStack;
43+
import net.minecraft.world.item.Items;
4444
import net.minecraft.world.level.biome.Biome;
4545
import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs;
4646

src/main/java/aztech/modern_industrialization/machines/recipe/condition/CustomProcessCondition.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,10 @@
2727
import aztech.modern_industrialization.machines.recipe.MachineRecipe;
2828
import com.mojang.serialization.Codec;
2929
import com.mojang.serialization.MapCodec;
30-
import com.mojang.serialization.codecs.RecordCodecBuilder;
3130
import java.util.HashMap;
3231
import java.util.List;
3332
import java.util.Map;
3433
import java.util.Objects;
35-
import java.util.Optional;
3634
import java.util.function.BiPredicate;
3735
import net.minecraft.network.RegistryFriendlyByteBuf;
3836
import net.minecraft.network.chat.Component;
@@ -71,18 +69,6 @@ private record Definition(
7169
ItemStack icon, List<Component> description) {
7270
}
7371

74-
private static MapCodec<CustomProcessCondition> makeCodec(boolean syncToClient) {
75-
return RecordCodecBuilder.mapCodec(
76-
g -> g
77-
.group(
78-
Codec.STRING.fieldOf("custom_id").forGetter(c -> c.id),
79-
ItemStack.OPTIONAL_CODEC.fieldOf("icon").forGetter(c -> c.icon),
80-
ComponentSerialization.CODEC.listOf().optionalFieldOf("description")
81-
.forGetter(c -> syncToClient ? Optional.of(c.description) : Optional.empty()))
82-
.apply(g, (id, icon, desc) -> desc.map(d -> new CustomProcessCondition(id, icon, d))
83-
.orElseGet(() -> new CustomProcessCondition(id))));
84-
}
85-
8672
static final MapCodec<CustomProcessCondition> CODEC = Codec.STRING.fieldOf("custom_id").xmap(CustomProcessCondition::new, c -> c.id);
8773
static final StreamCodec<RegistryFriendlyByteBuf, CustomProcessCondition> STREAM_CODEC = StreamCodec.composite(
8874
ByteBufCodecs.STRING_UTF8,

0 commit comments

Comments
 (0)