It compiles

TechReborn · Jul 4, 2023 · d0a7695 · d0a7695
1 parent fd1eb94
commit d0a7695
Show file tree

Hide file tree

Showing 114 changed files with 487 additions and 569 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -9,7 +9,7 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ 1.18.2 ]
+    branches: [ 1.18.2, 1.20.1 ]
   pull_request:
     branches: [ 1.18.2 ]
 

diff --git a/build.gradle b/build.gradle
@@ -157,11 +157,11 @@ dependencies {
     }
 //    runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}")
 
-    runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}")
-    compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}:api")
+     runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}")
+     compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}:api")
 
-    compileOnly fg.deobf("vazkii.patchouli:Patchouli:${project.patchouli_version}:api")
-    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${project.patchouli_version}")
+    // compileOnly fg.deobf("vazkii.patchouli:Patchouli:${project.patchouli_version}:api")
+    // runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${project.patchouli_version}")
 
 //    compileOnly fg.deobf("team.chisel.ctm:CTM:${project.ctm_version}")
 //    runtimeOnly fg.deobf("team.chisel.ctm:CTM:${project.ctm_version}")

diff --git a/gradle.properties b/gradle.properties
@@ -5,10 +5,10 @@ mod_version = 5.0.3
 mod_id = rebornstorage
 maven_group = gigabit101
 
-mc_version = 1.19.2
-forge_version = 43.1.32
-jei_version=9.5.4.171
-rs_version=1.11.0
-curios_version=1.19.1-5.1.0.5
+mc_version = 1.20.1
+forge_version = 47.0.19
+jei_version=15.1.0.19
+rs_version=1.12.1
+curios_version=5.2.0-beta.3+1.20.1
 patchouli_version=1.19-75
 ctm_version=1.18.2-1.1.4+4
diff --git a/src/main/java/net/gigabit101/rebornstorage/RebornStorage.java b/src/main/java/net/gigabit101/rebornstorage/RebornStorage.java
@@ -27,7 +27,11 @@
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.api.distmarker.Dist;
@@ -44,6 +48,7 @@
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.registries.RegisterEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import top.theillusivec4.curios.api.SlotTypeMessage;
@@ -73,6 +78,7 @@ public RebornStorage()
         ModContainers.CONTAINERS.register(eventBus);
         eventBus.addListener(this::preInit);
         eventBus.addListener(this::clientInit);
+        eventBus.addListener(this::registerCreativeTab);
         InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.CHARM.getMessageBuilder().size(4).build());
         InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> new SlotTypeMessage.Builder("grid").icon(new ResourceLocation(Constants.MOD_ID, "items/grid")).size(1).build());
         MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
@@ -129,6 +135,19 @@ public void onKeyInput(InputEvent.Key e)
         }
     }
 
+    private void registerCreativeTab(RegisterEvent event) {
+        ResourceKey<CreativeModeTab> TAB = ResourceKey.create(net.minecraft.core.registries.Registries.CREATIVE_MODE_TAB, new ResourceLocation(Constants.MOD_ID, "creative_tab"));
+        event.register(net.minecraft.core.registries.Registries.CREATIVE_MODE_TAB, creativeModeTabRegisterHelper ->
+        {
+            creativeModeTabRegisterHelper.register(TAB, CreativeModeTab.builder().icon(() -> new ItemStack(ModBlocks.BLOCK_MULTI_STORAGE.get()))
+                    .title(Component.translatable("itemGroup." + Constants.MOD_ID))
+                    .displayItems((params, output) -> {
+                        ModItems.ITEMS.getEntries().forEach(itemRegistryObject -> output.accept(itemRegistryObject.get()));
+                    })
+                    .build());
+        });
+    }
+
     public static MultiBlockCrafter getMultiBlock(Level world, BlockPos pos)
     {
         BlockEntity tileEntity = world.getBlockEntity(pos);

diff --git a/src/main/java/net/gigabit101/rebornstorage/RebornStorageClient.java b/src/main/java/net/gigabit101/rebornstorage/RebornStorageClient.java
@@ -9,9 +9,10 @@
 @Mod.EventBusSubscriber(modid = Constants.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class RebornStorageClient
 {
-    @SubscribeEvent
-    public static void textureStitch(TextureStitchEvent.Pre event)
-    {
-        event.addSprite(new ResourceLocation(Constants.MOD_ID, "items/grid"));
-    }
+    //TODO
+//    @SubscribeEvent
+//    public static void textureStitch(TextureStitchEvent.Pre event)
+//    {
+//        event.addSprite(new ResourceLocation(Constants.MOD_ID, "items/grid"));
+//    }
 }