Skip to content

Commit a2ee75a

Browse files
1.18.2
1 parent 11e39c7 commit a2ee75a

11 files changed

Lines changed: 34 additions & 54 deletions

File tree

build.gradle

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ buildscript {
44
maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
55
}
66
dependencies {
7-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0,6.2', changing: true
87
classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
98
}
109
}
@@ -14,7 +13,6 @@ plugins {
1413
id 'idea'
1514
id 'maven-publish'
1615
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
17-
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
1816
}
1917

2018
version = mod_version
@@ -124,11 +122,6 @@ minecraft {
124122
sourceSets.main.resources { srcDir 'src/generated/resources' }
125123

126124
repositories {
127-
maven {
128-
// location of the maven that hosts JEI files since January 2023
129-
name = "Jared's maven"
130-
url = "https://maven.blamejared.com/"
131-
}
132125
maven {
133126
url "https://cursemaven.com"
134127
}
@@ -141,10 +134,8 @@ dependencies {
141134
// then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
142135
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
143136

144-
implementation fg.deobf("curse.maven:jei-238222:7391695")
145-
implementation fg.deobf("curse.maven:applied-energistics-2-223794:7148487")
146-
implementation fg.deobf("curse.maven:jade-324717:6855440")
147-
implementation fg.deobf("curse.maven:guideme-1173950:7127447")
137+
implementation fg.deobf("curse.maven:jei-238222:5846864")
138+
implementation fg.deobf("curse.maven:applied-energistics-2-223794:4733112")
148139
// Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
149140
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
150141
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")

gradle.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ org.gradle.caching=true
66
org.gradle.configuration-cache=false
77

88
# Environment Properties
9-
minecraft_version=1.20.1
9+
minecraft_version=1.18.2
1010
# The Minecraft version range can use any release version of Minecraft as bounds.
1111
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
1212
# as they do not follow standard versioning conventions.
13-
minecraft_version_range=[1.20.1, 1.21)
14-
forge_version=47.4.16
15-
forge_version_range=[47,)
13+
minecraft_version_range=[1.18.2, 1.19)
14+
forge_version=40.3.12
15+
forge_version_range=[40,)
1616
# The loader version range can only use the major version of FML as bounds
17-
loader_version_range=[47,)
18-
mapping_channel=parchment
17+
loader_version_range=[40,)
18+
mapping_channel=official
1919
# The mapping version to query from the mapping channel.
2020
# This must match the format required by the mapping channel.
21-
mapping_version=2023.09.03-1.20.1
21+
mapping_version=1.18.2
2222

2323
## Mod Properties
2424

@@ -30,7 +30,7 @@ mod_name=Applied Infinity Pattern
3030
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
3131
mod_license=All Rights Reserved
3232
# The mod version. See https://semver.org/
33-
mod_version=1.0-Forge-1.20.1
33+
mod_version=1.0-Forge-1.18.2
3434
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
3535
# This should match the base package used for the mod sources.
3636
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/com/neofastftl/infinitypattern/InfinityPattern.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.neofastftl.infinitypattern;
22

33
import com.neofastftl.infinitypattern.guidebook.IFPATGuide;
4-
import com.neofastftl.infinitypattern.registries.ModCreativeTabs;
54
import com.neofastftl.infinitypattern.registries.ModItems;
65
import net.minecraftforge.eventbus.api.IEventBus;
76
import net.minecraftforge.fml.common.Mod;
@@ -14,7 +13,6 @@ public class InfinityPattern {
1413
public InfinityPattern() {
1514
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
1615
ModItems.ITEMS.register(modEventBus);
17-
ModCreativeTabs.CREATIVE_MODE_TABS.register(modEventBus);
1816
IFPATGuide.init();
1917
}
2018
}

src/main/java/com/neofastftl/infinitypattern/mixins/MixinPatternEncodingTermMenu.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
package com.neofastftl.infinitypattern.mixins;
22

3-
import appeng.parts.encoding.PatternEncodingLogic;
43
import com.neofastftl.infinitypattern.registries.ModItems;
54
import org.spongepowered.asm.mixin.Final;
65
import org.spongepowered.asm.mixin.Mixin;
76
import org.spongepowered.asm.mixin.Shadow;
87

9-
import net.minecraft.world.entity.player.Inventory;
10-
import net.minecraft.world.inventory.MenuType;
11-
12-
import appeng.api.storage.ITerminalHost;
13-
import appeng.menu.me.common.MEStorageMenu;
148
import appeng.menu.me.items.PatternEncodingTermMenu;
159
import appeng.menu.slot.RestrictedInputSlot;
1610
import org.spongepowered.asm.mixin.injection.At;
@@ -21,7 +15,7 @@
2115
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
2216

2317
@Mixin(value = PatternEncodingTermMenu.class, remap = false)
24-
public abstract class MixinPatternEncodingTermMenu extends MEStorageMenu {
18+
public abstract class MixinPatternEncodingTermMenu {
2519

2620
@Final
2721
@Shadow
@@ -58,7 +52,4 @@ private void onEncodePatternReturn(CallbackInfo ci) {
5852
}
5953
}
6054

61-
public MixinPatternEncodingTermMenu(MenuType<?> menuType, int id, Inventory ip, ITerminalHost host, PatternEncodingLogic encodingLogic) {
62-
super(menuType, id, ip, host);
63-
}
6455
}

src/main/java/com/neofastftl/infinitypattern/mixins/MixinRestrictedInputSlot.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.neofastftl.infinitypattern.mixins;
22

3-
import appeng.menu.slot.AppEngSlot;
43
import appeng.menu.slot.RestrictedInputSlot;
54
import com.neofastftl.infinitypattern.registries.ModItems;
65
import net.minecraft.world.item.ItemStack;

src/main/java/com/neofastftl/infinitypattern/registries/ModCreativeTabs.java

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,27 @@
22

33
import com.neofastftl.infinitypattern.InfinityPattern;
44
import com.neofastftl.infinitypattern.guidebook.IFPATGuide;
5-
import net.minecraft.core.registries.Registries;
6-
import net.minecraft.network.chat.Component;
5+
import net.minecraft.core.NonNullList;
76
import net.minecraft.world.item.CreativeModeTab;
8-
import net.minecraftforge.registries.DeferredRegister;
9-
import net.minecraftforge.registries.RegistryObject;
7+
import net.minecraft.world.item.ItemStack;
108

119
public class ModCreativeTabs {
12-
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS =
13-
DeferredRegister.create(Registries.CREATIVE_MODE_TAB, InfinityPattern.MODID);
10+
public static final CreativeModeTab INFINITY_PATTERN = new CreativeModeTab(InfinityPattern.MODID) {
11+
@Override
12+
public ItemStack makeIcon() {
13+
return ModItems.ITEM_INFINITE_EMPTY_PATTERN.get().getDefaultInstance();
14+
}
1415

15-
public static final RegistryObject<CreativeModeTab> INFINITY_PATTERN =
16-
CREATIVE_MODE_TABS.register("infinitypattern", () -> CreativeModeTab.builder()
17-
.title(Component.translatable("itemGroup.infinitypattern"))
18-
.icon(() -> ModItems.ITEM_INFINITE_EMPTY_PATTERN.get().getDefaultInstance())
19-
.displayItems((parameters, output) -> {
20-
output.accept(ModItems.ITEM_INFINITE_EMPTY_PATTERN.get());
21-
var guideItem = IFPATGuide.createGuideItem();
22-
if (!guideItem.isEmpty()) {
23-
output.accept(guideItem);
24-
}
25-
}).build());
16+
@Override
17+
public void fillItemList(NonNullList<ItemStack> items) {
18+
super.fillItemList(items);
19+
var guideItem = IFPATGuide.createGuideItem();
20+
if (!guideItem.isEmpty()) {
21+
items.add(guideItem);
22+
}
23+
}
24+
};
25+
26+
private ModCreativeTabs() {
27+
}
2628
}

src/main/java/com/neofastftl/infinitypattern/registries/ModItems.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ public class ModItems {
1111
DeferredRegister.create(ForgeRegistries.ITEMS, InfinityPattern.MODID);
1212

1313
public static final RegistryObject<Item> ITEM_INFINITE_EMPTY_PATTERN = ITEMS.register("infinite_empty_pattern",
14-
() -> new Item(new Item.Properties().stacksTo(1)));
14+
() -> new Item(new Item.Properties().stacksTo(1).tab(ModCreativeTabs.INFINITY_PATTERN)));
1515
}

src/main/resources/data/ae2/tags/item/blank_pattern.json renamed to src/main/resources/data/ae2/tags/items/blank_pattern.json

File renamed without changes.

src/main/resources/data/infinitypattern/recipes/infinite_empty_pattern.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"type": "minecraft:crafting_shaped",
3-
"category": "misc",
43
"key": {
54
"s": {
65
"item": "ae2:singularity"
@@ -22,6 +21,6 @@
2221
],
2322
"result": {
2423
"count": 1,
25-
"id": "infinitypattern:infinite_empty_pattern"
24+
"item": "infinitypattern:infinite_empty_pattern"
2625
}
27-
}
26+
}

src/main/resources/data/minecraft/tags/item/blank_pattern.json renamed to src/main/resources/data/minecraft/tags/items/blank_pattern.json

File renamed without changes.

0 commit comments

Comments
 (0)