diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 00c5091..914f1ec 100644 --- 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 index 2aa8197..af111ac 100644 --- 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 index d4cae86..6d59517 100644 --- 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 index b7cebfb..a723859 100644 --- 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 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 index a3ca985..3a4d858 100644 --- 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")); +// } } diff --git a/src/main/java/net/gigabit101/rebornstorage/RebornStorageDataGenerator.java b/src/main/java/net/gigabit101/rebornstorage/RebornStorageDataGenerator.java index 7f561a4..9ab2897 100644 --- a/src/main/java/net/gigabit101/rebornstorage/RebornStorageDataGenerator.java +++ b/src/main/java/net/gigabit101/rebornstorage/RebornStorageDataGenerator.java @@ -1,310 +1,310 @@ -package net.gigabit101.rebornstorage; - -import com.google.common.collect.ImmutableList; -import com.mojang.datafixers.util.Pair; -import com.refinedmods.refinedstorage.RSBlocks; -import net.gigabit101.rebornstorage.init.ModBlocks; -import net.minecraft.core.Registry; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.loot.BlockLoot; -import net.minecraft.data.loot.LootTableProvider; -import net.minecraft.data.recipes.FinishedRecipe; -import net.minecraft.data.recipes.RecipeProvider; -import net.minecraft.data.tags.BlockTagsProvider; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.storage.loot.LootPool; -import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.LootTables; -import net.minecraft.world.level.storage.loot.ValidationContext; -import net.minecraft.world.level.storage.loot.entries.LootItem; -import net.minecraft.world.level.storage.loot.functions.CopyNameFunction; -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; -import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition; -import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; -import net.minecraftforge.client.model.generators.BlockStateProvider; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.common.data.LanguageProvider; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import org.jetbrains.annotations.NotNull; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; - -@Mod.EventBusSubscriber(modid = Constants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class RebornStorageDataGenerator -{ - @SubscribeEvent - public static void gatherData(GatherDataEvent event) - { - DataGenerator generator = event.getGenerator(); - - if (event.includeServer()) - { - generator.addProvider(true, new GeneratorRecipes(generator)); - generator.addProvider(true,new GeneratorLoots(generator)); - } - - if (event.includeClient()) - { - generator.addProvider(true,new GeneratorBlockTags(generator, event.getExistingFileHelper())); - generator.addProvider(true,new GeneratorLanguage(generator)); - generator.addProvider(true,new GeneratorBlockStates(generator, event.getExistingFileHelper())); - generator.addProvider(true,new GeneratorItemModels(generator, event.getExistingFileHelper())); - } - } - - static class GeneratorBlockStates extends BlockStateProvider - { - public GeneratorBlockStates(DataGenerator gen, ExistingFileHelper exFileHelper) - { - super(gen, Constants.MOD_ID, exFileHelper); - } - - @Override - protected void registerStatesAndModels() - { - } - - public void registerSidedBlock(Block block, String folder) - { - horizontalBlock(block, models().orientableWithBottom(getResourceLocation(block).getPath(), - modLoc("block/" + folder + "/side"), - modLoc("block/" + folder + "/front"), - modLoc("block/" + folder + "/bottom"), - modLoc("block/" + folder + "/top"))); - } - - public ResourceLocation getResourceLocation(Block block) - { - return Registry.BLOCK.getKey(block); - } - } - - static class GeneratorItemModels extends ItemModelProvider - { - public GeneratorItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper) - { - super(generator, Constants.MOD_ID, existingFileHelper); - } - - @Override - protected void registerModels() - { -// ModBlocks.CHARGERS.forEach((chargerTypes, blockSupplier) -> registerDefaultItemBlockModel(blockSupplier.get())); -// ModBlocks.POWER_CELLS.forEach((chargerTypes, blockSupplier) -> registerDefaultItemBlockModel(blockSupplier.get())); -// -// ModItems.BATTERIES.forEach((batteryTypes, itemSupplier) -> singleTexture(getResourceLocation(itemSupplier.get()).getPath(), -// mcLoc("item/generated"), "layer0", modLoc("item/" + batteryTypes.getName()))); -// -// ModItems.DRILL_BIT_TYPES.forEach((batteryTypes, itemSupplier) -> singleTexture(getResourceLocation(itemSupplier.get()).getPath(), -// mcLoc("item/generated"), "layer0", modLoc("item/" + batteryTypes.getName()))); -// -// ModItems.DRILL_HANDLE_TYPES.forEach((batteryTypes, itemSupplier) -> singleTexture(getResourceLocation(itemSupplier.get()).getPath(), -// mcLoc("item/generated"), "layer0", modLoc("item/drill_handle"))); - } - - public void registerDefaultItemBlockModel(Block block) - { - String path = getResourceLocation(block).getPath(); - getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + path))); - } - - public ResourceLocation getResourceLocation(Item item) - { - return Registry.ITEM.getKey(item); - } - - public ResourceLocation getResourceLocation(Block block) - { - return Registry.BLOCK.getKey(block); - } - - @Override - public @NotNull String getName() - { - return "Item Models"; - } - } - - static class GeneratorLanguage extends LanguageProvider - { - public GeneratorLanguage(DataGenerator gen) - { - super(gen, Constants.MOD_ID, "en_us"); - } - - @Override - protected void addTranslations() - { -// addBlock(ModBlocks.CHARGERS.get(ChargerTypes.BASIC), "Basic Charger"); -// addBlock(ModBlocks.CHARGERS.get(ChargerTypes.ADVANCED), "Advanced Charger"); -// addBlock(ModBlocks.CHARGERS.get(ChargerTypes.ULTIMATE), "Ultimate Charger"); -// addBlock(ModBlocks.CHARGERS.get(ChargerTypes.CREATIVE), "Creative Charger"); -// -// addBlock(ModBlocks.POWER_CELLS.get(PowerCellTypes.BASIC), "Basic Energy cell"); -// addBlock(ModBlocks.POWER_CELLS.get(PowerCellTypes.ADVANCED), "Advanced Energy cell"); -// addBlock(ModBlocks.POWER_CELLS.get(PowerCellTypes.ULTIMATE), "Ultimate Energy cell"); -// addBlock(ModBlocks.POWER_CELLS.get(PowerCellTypes.CREATIVE), "Creative Energy cell"); -// -// addItem(ModItems.DRILL_BIT_TYPES.get(DrillBitTypes.IRON), "Iron Drill bit"); -// addItem(ModItems.DRILL_BIT_TYPES.get(DrillBitTypes.GOLD), "Gold Drill bit"); -// addItem(ModItems.DRILL_BIT_TYPES.get(DrillBitTypes.DIAMOND), "Diamond Drill bit"); -// addItem(ModItems.DRILL_BIT_TYPES.get(DrillBitTypes.NETHERITE), "Netherite Drill bit"); -// -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.WHITE), "White Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.ORANGE), "Orange Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.MAGENTA), "Magenta Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.LIGHT_BLUE), "Light Blue Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.YELLOW), "Yellow Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.LIME), "Lime Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.PINK), "Pink Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.GRAY), "Gray Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.LIGHT_GRAY), "Light Gray Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.CYAN), "Cyan Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.PURPLE), "Purple Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.BLUE), "Blue Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.BROWN), "Brown Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.GREEN), "Green Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.RED), "Red Drill handle"); -// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.BLACK), "Black Drill handle"); -// -// -// add("itemGroup.techmod", "Tech-Mod"); -// add("screen.techmod.energy", "Energy: %s/%s FE"); -// add("screen.techmod.no_fuel", "Fuel source empty"); -// add("screen.techmod.burn_time", "Burn time left: %ss"); -// add("item.techmod.basic_battery", "Basic Battery"); -// add("item.techmod.advanced_battery", "Advanced Battery"); -// add("item.techmod.ultimate_battery", "Ultimate Battery"); - } - } - - - static class GeneratorLoots extends LootTableProvider - { - public GeneratorLoots(DataGenerator dataGeneratorIn) - { - super(dataGeneratorIn); - } - - @Override - protected @NotNull List>>, LootContextParamSet>> getTables() - { - return ImmutableList.of(Pair.of(Blocks::new, LootContextParamSets.BLOCK)); - } - - private static class Blocks extends BlockLoot - { - @Override - protected void addTables() - { - ModBlocks.BLOCKS.getEntries().forEach(blockRegistryObject -> this.add(blockRegistryObject.get(), LootTable.lootTable().withPool(create(blockRegistryObject.get())))); - } - - public LootPool.Builder create(Block block) - { - return LootPool.lootPool().name(getResourceLocation(block).toString()) - .setRolls(ConstantValue.exactly(1)).when(ExplosionCondition.survivesExplosion()) - .add(LootItem.lootTableItem(block) - .apply(CopyNameFunction.copyName(CopyNameFunction.NameSource.BLOCK_ENTITY))); - - } - - public ResourceLocation getResourceLocation(Block block) - { - return Registry.BLOCK.getKey(block); - } - - @Override - protected @NotNull Iterable getKnownBlocks() - { - return ImmutableList.of( - ModBlocks.BLOCK_MULTI_FRAME.get(), - ModBlocks.BLOCK_MULTI_HEAT.get(), - ModBlocks.BLOCK_MULTI_CPU.get(), - ModBlocks.BLOCK_MULTI_STORAGE.get(), - ModBlocks.BLOCK_ADVANCED_WIRELESS_TRANSMITTER.get() - ); - } - } - - @Override - protected void validate(Map map, @NotNull ValidationContext validationtracker) - { - map.forEach((name, table) -> LootTables.validate(validationtracker, name, table)); - } - } - - static class GeneratorRecipes extends RecipeProvider - { - public GeneratorRecipes(DataGenerator generator) - { - super(generator); - } - - @Override - protected void buildCraftingRecipes(@NotNull Consumer consumer) - { -// Block block = ModBlocks.CHARGERS.get(ChargerTypes.BASIC).get(); -// ShapedRecipeBuilder.shaped(block) -// .define('i', Tags.Items.INGOTS_IRON) -// .define('r', Tags.Items.DUSTS_REDSTONE) -// .define('l', Tags.Items.STORAGE_BLOCKS_COAL) -// .define('d', Tags.Items.GEMS_LAPIS) -// .pattern("iri") -// .pattern("drd") -// .pattern("ili") -// .unlockedBy("has_diamonds", has(Tags.Items.GEMS_DIAMOND)).save(consumer); - } - } - - static class GeneratorBlockTags extends BlockTagsProvider - { - public GeneratorBlockTags(DataGenerator generator, @Nullable ExistingFileHelper existingFileHelper) - { - super(generator, Constants.MOD_ID, existingFileHelper); - } - - @Override - protected void addTags() - { - ModBlocks.BLOCKS.getEntries().forEach(blockRegistryObject -> addMineable(blockRegistryObject.get())); - - RSBlocks.COLORED_BLOCKS.forEach(registryObject -> addMineable(registryObject.get())); - RSBlocks.STORAGE_BLOCKS.forEach((itemStorageType, storageBlockRegistryObject) -> addMineable(storageBlockRegistryObject.get())); - RSBlocks.FLUID_STORAGE_BLOCKS.forEach((fluidStorageType, fluidStorageBlockRegistryObject) -> addMineable(fluidStorageBlockRegistryObject.get())); - - tag(BlockTags.MINEABLE_WITH_PICKAXE).add( - RSBlocks.IMPORTER.get(), - RSBlocks.EXPORTER.get(), - RSBlocks.EXTERNAL_STORAGE.get(), - RSBlocks.DISK_DRIVE.get(), - RSBlocks.INTERFACE.get(), - RSBlocks.STORAGE_MONITOR.get(), - RSBlocks.FLUID_INTERFACE.get(), - RSBlocks.CONSTRUCTOR.get(), - RSBlocks.DESTRUCTOR.get(), - RSBlocks.PORTABLE_GRID.get(), - RSBlocks.CREATIVE_PORTABLE_GRID.get(), - RSBlocks.CABLE.get() - ); - } - - public void addMineable(Block block) - { - tag(BlockTags.MINEABLE_WITH_PICKAXE).add(block); - } - } -} +//package net.gigabit101.rebornstorage; +// +//import com.google.common.collect.ImmutableList; +//import com.mojang.datafixers.util.Pair; +//import com.refinedmods.refinedstorage.RSBlocks; +//import net.gigabit101.rebornstorage.init.ModBlocks; +//import net.minecraft.core.Registry; +//import net.minecraft.data.DataGenerator; +//import net.minecraft.data.loot.BlockLoot; +//import net.minecraft.data.loot.LootTableProvider; +//import net.minecraft.data.recipes.FinishedRecipe; +//import net.minecraft.data.recipes.RecipeProvider; +//import net.minecraft.data.tags.BlockTagsProvider; +//import net.minecraft.resources.ResourceLocation; +//import net.minecraft.tags.BlockTags; +//import net.minecraft.world.item.Item; +//import net.minecraft.world.level.block.Block; +//import net.minecraft.world.level.storage.loot.LootPool; +//import net.minecraft.world.level.storage.loot.LootTable; +//import net.minecraft.world.level.storage.loot.LootTables; +//import net.minecraft.world.level.storage.loot.ValidationContext; +//import net.minecraft.world.level.storage.loot.entries.LootItem; +//import net.minecraft.world.level.storage.loot.functions.CopyNameFunction; +//import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; +//import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +//import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition; +//import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; +//import net.minecraftforge.client.model.generators.BlockStateProvider; +//import net.minecraftforge.client.model.generators.ItemModelProvider; +//import net.minecraftforge.client.model.generators.ModelFile; +//import net.minecraftforge.common.data.ExistingFileHelper; +//import net.minecraftforge.common.data.LanguageProvider; +//import net.minecraftforge.data.event.GatherDataEvent; +//import net.minecraftforge.eventbus.api.SubscribeEvent; +//import net.minecraftforge.fml.common.Mod; +//import org.jetbrains.annotations.NotNull; +// +//import javax.annotation.Nullable; +//import java.util.List; +//import java.util.Map; +//import java.util.function.BiConsumer; +//import java.util.function.Consumer; +//import java.util.function.Supplier; +// +//@Mod.EventBusSubscriber(modid = Constants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +//public class RebornStorageDataGenerator +//{ +// @SubscribeEvent +// public static void gatherData(GatherDataEvent event) +// { +// DataGenerator generator = event.getGenerator(); +// +// if (event.includeServer()) +// { +// generator.addProvider(true, new GeneratorRecipes(generator)); +// generator.addProvider(true,new GeneratorLoots(generator)); +// } +// +// if (event.includeClient()) +// { +// generator.addProvider(true,new GeneratorBlockTags(generator, event.getExistingFileHelper())); +// generator.addProvider(true,new GeneratorLanguage(generator)); +// generator.addProvider(true,new GeneratorBlockStates(generator, event.getExistingFileHelper())); +// generator.addProvider(true,new GeneratorItemModels(generator, event.getExistingFileHelper())); +// } +// } +// +// static class GeneratorBlockStates extends BlockStateProvider +// { +// public GeneratorBlockStates(DataGenerator gen, ExistingFileHelper exFileHelper) +// { +// super(gen, Constants.MOD_ID, exFileHelper); +// } +// +// @Override +// protected void registerStatesAndModels() +// { +// } +// +// public void registerSidedBlock(Block block, String folder) +// { +// horizontalBlock(block, models().orientableWithBottom(getResourceLocation(block).getPath(), +// modLoc("block/" + folder + "/side"), +// modLoc("block/" + folder + "/front"), +// modLoc("block/" + folder + "/bottom"), +// modLoc("block/" + folder + "/top"))); +// } +// +// public ResourceLocation getResourceLocation(Block block) +// { +// return Registry.BLOCK.getKey(block); +// } +// } +// +// static class GeneratorItemModels extends ItemModelProvider +// { +// public GeneratorItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper) +// { +// super(generator, Constants.MOD_ID, existingFileHelper); +// } +// +// @Override +// protected void registerModels() +// { +//// ModBlocks.CHARGERS.forEach((chargerTypes, blockSupplier) -> registerDefaultItemBlockModel(blockSupplier.get())); +//// ModBlocks.POWER_CELLS.forEach((chargerTypes, blockSupplier) -> registerDefaultItemBlockModel(blockSupplier.get())); +//// +//// ModItems.BATTERIES.forEach((batteryTypes, itemSupplier) -> singleTexture(getResourceLocation(itemSupplier.get()).getPath(), +//// mcLoc("item/generated"), "layer0", modLoc("item/" + batteryTypes.getName()))); +//// +//// ModItems.DRILL_BIT_TYPES.forEach((batteryTypes, itemSupplier) -> singleTexture(getResourceLocation(itemSupplier.get()).getPath(), +//// mcLoc("item/generated"), "layer0", modLoc("item/" + batteryTypes.getName()))); +//// +//// ModItems.DRILL_HANDLE_TYPES.forEach((batteryTypes, itemSupplier) -> singleTexture(getResourceLocation(itemSupplier.get()).getPath(), +//// mcLoc("item/generated"), "layer0", modLoc("item/drill_handle"))); +// } +// +// public void registerDefaultItemBlockModel(Block block) +// { +// String path = getResourceLocation(block).getPath(); +// getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + path))); +// } +// +// public ResourceLocation getResourceLocation(Item item) +// { +// return Registry.ITEM.getKey(item); +// } +// +// public ResourceLocation getResourceLocation(Block block) +// { +// return Registry.BLOCK.getKey(block); +// } +// +// @Override +// public @NotNull String getName() +// { +// return "Item Models"; +// } +// } +// +// static class GeneratorLanguage extends LanguageProvider +// { +// public GeneratorLanguage(DataGenerator gen) +// { +// super(gen, Constants.MOD_ID, "en_us"); +// } +// +// @Override +// protected void addTranslations() +// { +//// addBlock(ModBlocks.CHARGERS.get(ChargerTypes.BASIC), "Basic Charger"); +//// addBlock(ModBlocks.CHARGERS.get(ChargerTypes.ADVANCED), "Advanced Charger"); +//// addBlock(ModBlocks.CHARGERS.get(ChargerTypes.ULTIMATE), "Ultimate Charger"); +//// addBlock(ModBlocks.CHARGERS.get(ChargerTypes.CREATIVE), "Creative Charger"); +//// +//// addBlock(ModBlocks.POWER_CELLS.get(PowerCellTypes.BASIC), "Basic Energy cell"); +//// addBlock(ModBlocks.POWER_CELLS.get(PowerCellTypes.ADVANCED), "Advanced Energy cell"); +//// addBlock(ModBlocks.POWER_CELLS.get(PowerCellTypes.ULTIMATE), "Ultimate Energy cell"); +//// addBlock(ModBlocks.POWER_CELLS.get(PowerCellTypes.CREATIVE), "Creative Energy cell"); +//// +//// addItem(ModItems.DRILL_BIT_TYPES.get(DrillBitTypes.IRON), "Iron Drill bit"); +//// addItem(ModItems.DRILL_BIT_TYPES.get(DrillBitTypes.GOLD), "Gold Drill bit"); +//// addItem(ModItems.DRILL_BIT_TYPES.get(DrillBitTypes.DIAMOND), "Diamond Drill bit"); +//// addItem(ModItems.DRILL_BIT_TYPES.get(DrillBitTypes.NETHERITE), "Netherite Drill bit"); +//// +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.WHITE), "White Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.ORANGE), "Orange Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.MAGENTA), "Magenta Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.LIGHT_BLUE), "Light Blue Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.YELLOW), "Yellow Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.LIME), "Lime Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.PINK), "Pink Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.GRAY), "Gray Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.LIGHT_GRAY), "Light Gray Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.CYAN), "Cyan Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.PURPLE), "Purple Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.BLUE), "Blue Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.BROWN), "Brown Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.GREEN), "Green Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.RED), "Red Drill handle"); +//// addItem(ModItems.DRILL_HANDLE_TYPES.get(DyeColor.BLACK), "Black Drill handle"); +//// +//// +//// add("itemGroup.techmod", "Tech-Mod"); +//// add("screen.techmod.energy", "Energy: %s/%s FE"); +//// add("screen.techmod.no_fuel", "Fuel source empty"); +//// add("screen.techmod.burn_time", "Burn time left: %ss"); +//// add("item.techmod.basic_battery", "Basic Battery"); +//// add("item.techmod.advanced_battery", "Advanced Battery"); +//// add("item.techmod.ultimate_battery", "Ultimate Battery"); +// } +// } +// +// +// static class GeneratorLoots extends LootTableProvider +// { +// public GeneratorLoots(DataGenerator dataGeneratorIn) +// { +// super(dataGeneratorIn); +// } +// +// @Override +// protected @NotNull List>>, LootContextParamSet>> getTables() +// { +// return ImmutableList.of(Pair.of(Blocks::new, LootContextParamSets.BLOCK)); +// } +// +// private static class Blocks extends BlockLoot +// { +// @Override +// protected void addTables() +// { +// ModBlocks.BLOCKS.getEntries().forEach(blockRegistryObject -> this.add(blockRegistryObject.get(), LootTable.lootTable().withPool(create(blockRegistryObject.get())))); +// } +// +// public LootPool.Builder create(Block block) +// { +// return LootPool.lootPool().name(getResourceLocation(block).toString()) +// .setRolls(ConstantValue.exactly(1)).when(ExplosionCondition.survivesExplosion()) +// .add(LootItem.lootTableItem(block) +// .apply(CopyNameFunction.copyName(CopyNameFunction.NameSource.BLOCK_ENTITY))); +// +// } +// +// public ResourceLocation getResourceLocation(Block block) +// { +// return Registry.BLOCK.getKey(block); +// } +// +// @Override +// protected @NotNull Iterable getKnownBlocks() +// { +// return ImmutableList.of( +// ModBlocks.BLOCK_MULTI_FRAME.get(), +// ModBlocks.BLOCK_MULTI_HEAT.get(), +// ModBlocks.BLOCK_MULTI_CPU.get(), +// ModBlocks.BLOCK_MULTI_STORAGE.get(), +// ModBlocks.BLOCK_ADVANCED_WIRELESS_TRANSMITTER.get() +// ); +// } +// } +// +// @Override +// protected void validate(Map map, @NotNull ValidationContext validationtracker) +// { +// map.forEach((name, table) -> LootTables.validate(validationtracker, name, table)); +// } +// } +// +// static class GeneratorRecipes extends RecipeProvider +// { +// public GeneratorRecipes(DataGenerator generator) +// { +// super(generator); +// } +// +// @Override +// protected void buildCraftingRecipes(@NotNull Consumer consumer) +// { +//// Block block = ModBlocks.CHARGERS.get(ChargerTypes.BASIC).get(); +//// ShapedRecipeBuilder.shaped(block) +//// .define('i', Tags.Items.INGOTS_IRON) +//// .define('r', Tags.Items.DUSTS_REDSTONE) +//// .define('l', Tags.Items.STORAGE_BLOCKS_COAL) +//// .define('d', Tags.Items.GEMS_LAPIS) +//// .pattern("iri") +//// .pattern("drd") +//// .pattern("ili") +//// .unlockedBy("has_diamonds", has(Tags.Items.GEMS_DIAMOND)).save(consumer); +// } +// } +// +// static class GeneratorBlockTags extends BlockTagsProvider +// { +// public GeneratorBlockTags(DataGenerator generator, @Nullable ExistingFileHelper existingFileHelper) +// { +// super(generator, Constants.MOD_ID, existingFileHelper); +// } +// +// @Override +// protected void addTags() +// { +// ModBlocks.BLOCKS.getEntries().forEach(blockRegistryObject -> addMineable(blockRegistryObject.get())); +// +// RSBlocks.COLORED_BLOCKS.forEach(registryObject -> addMineable(registryObject.get())); +// RSBlocks.STORAGE_BLOCKS.forEach((itemStorageType, storageBlockRegistryObject) -> addMineable(storageBlockRegistryObject.get())); +// RSBlocks.FLUID_STORAGE_BLOCKS.forEach((fluidStorageType, fluidStorageBlockRegistryObject) -> addMineable(fluidStorageBlockRegistryObject.get())); +// +// tag(BlockTags.MINEABLE_WITH_PICKAXE).add( +// RSBlocks.IMPORTER.get(), +// RSBlocks.EXPORTER.get(), +// RSBlocks.EXTERNAL_STORAGE.get(), +// RSBlocks.DISK_DRIVE.get(), +// RSBlocks.INTERFACE.get(), +// RSBlocks.STORAGE_MONITOR.get(), +// RSBlocks.FLUID_INTERFACE.get(), +// RSBlocks.CONSTRUCTOR.get(), +// RSBlocks.DESTRUCTOR.get(), +// RSBlocks.PORTABLE_GRID.get(), +// RSBlocks.CREATIVE_PORTABLE_GRID.get(), +// RSBlocks.CABLE.get() +// ); +// } +// +// public void addMineable(Block block) +// { +// tag(BlockTags.MINEABLE_WITH_PICKAXE).add(block); +// } +// } +//} diff --git a/src/main/java/net/gigabit101/rebornstorage/blockentities/BlockEntityAdvancedWirelessTransmitter.java b/src/main/java/net/gigabit101/rebornstorage/blockentities/BlockEntityAdvancedWirelessTransmitter.java index b989709..8616a3e 100644 --- a/src/main/java/net/gigabit101/rebornstorage/blockentities/BlockEntityAdvancedWirelessTransmitter.java +++ b/src/main/java/net/gigabit101/rebornstorage/blockentities/BlockEntityAdvancedWirelessTransmitter.java @@ -3,16 +3,18 @@ import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationSpec; +import net.gigabit101.rebornstorage.Constants; import net.gigabit101.rebornstorage.init.ModBlocks; import net.gigabit101.rebornstorage.nodes.AdvancedWirelessTransmitterNode; import net.minecraft.core.BlockPos; import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; public class BlockEntityAdvancedWirelessTransmitter extends NetworkNodeBlockEntity { - public static final BlockEntitySynchronizationParameter RANGE = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, 0, (t) -> t.getNode().getRange()); + public static final BlockEntitySynchronizationParameter RANGE = new BlockEntitySynchronizationParameter<>(new ResourceLocation(Constants.MOD_ID, "wireless_transmitter_range"), EntityDataSerializers.INT, 0, (t) -> t.getNode().getRange()); public static BlockEntitySynchronizationSpec SPEC = BlockEntitySynchronizationSpec.builder().addWatchedParameter(REDSTONE_MODE).addWatchedParameter(RANGE).build(); public BlockEntityAdvancedWirelessTransmitter(BlockPos pos, BlockState state) diff --git a/src/main/java/net/gigabit101/rebornstorage/blocks/BlockAdvancedWirelessTransmitter.java b/src/main/java/net/gigabit101/rebornstorage/blocks/BlockAdvancedWirelessTransmitter.java index 1bd12b2..e23b3dc 100644 --- a/src/main/java/net/gigabit101/rebornstorage/blocks/BlockAdvancedWirelessTransmitter.java +++ b/src/main/java/net/gigabit101/rebornstorage/blocks/BlockAdvancedWirelessTransmitter.java @@ -16,7 +16,6 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; @@ -36,7 +35,7 @@ public class BlockAdvancedWirelessTransmitter extends ColoredNetworkBlock public BlockAdvancedWirelessTransmitter() { - super(Properties.of(Material.METAL).strength(2.0F)); + super(Properties.of().strength(2.0F)); } @Override diff --git a/src/main/java/net/gigabit101/rebornstorage/blocks/BlockMultiCrafter.java b/src/main/java/net/gigabit101/rebornstorage/blocks/BlockMultiCrafter.java index 35b7340..85fc293 100644 --- a/src/main/java/net/gigabit101/rebornstorage/blocks/BlockMultiCrafter.java +++ b/src/main/java/net/gigabit101/rebornstorage/blocks/BlockMultiCrafter.java @@ -2,73 +2,33 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager; -import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.api.util.Action; import com.refinedmods.refinedstorage.apiimpl.API; -import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; -import com.refinedmods.refinedstorage.blockentity.CrafterManagerBlockEntity; -import com.refinedmods.refinedstorage.container.CrafterManagerContainerMenu; -import com.refinedmods.refinedstorage.container.factory.CrafterManagerMenuProvider; -import com.refinedmods.refinedstorage.screen.EmptyScreenInfoProvider; -import com.refinedmods.refinedstorage.util.NetworkUtils; -import net.gigabit101.rebornstorage.RebornStorage; -import net.gigabit101.rebornstorage.RebornStorageEventHandler; import net.gigabit101.rebornstorage.blockentities.BlockEntityMultiCrafter; -import net.gigabit101.rebornstorage.core.multiblock.MultiblockRegistry; -import net.gigabit101.rebornstorage.init.ModBlocks; import net.gigabit101.rebornstorage.packet.PacketGui; import net.gigabit101.rebornstorage.packet.PacketHandler; -import net.minecraft.Util; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Containers; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.BaseEntityBlock; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.phys.BlockHitResult; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.network.NetworkHooks; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Iterator; -import java.util.List; -import java.util.Map; public class BlockMultiCrafter extends BaseEntityBlock { -// TODO Disabled by Rid - -// public static final BooleanProperty UP_DOWN_CONNECTION = BooleanProperty.create("up_down"); -// public static final BooleanProperty LEFT_RIGHT_CONNECTION = BooleanProperty.create("left_right"); - public BlockMultiCrafter() { - super(Properties.of(Material.METAL).strength(2.0F)); -// TODO Disabled by Rid - -// this.registerDefaultState(getStateDefinition().any().setValue(UP_DOWN_CONNECTION, false).setValue(LEFT_RIGHT_CONNECTION, false)); + super(Properties.of().strength(2.0F)); } @Override @@ -77,40 +37,6 @@ public BlockMultiCrafter() return RenderShape.MODEL; } - @Nullable - @Override - public BlockState getStateForPlacement(@NotNull BlockPlaceContext blockPlaceContext) - { - Level level = blockPlaceContext.getLevel(); - BlockPos pos = blockPlaceContext.getClickedPos(); - -// TODO Disabled by Rid - -// if(level.getBlockState(pos.below()).getBlock() == ModBlocks.BLOCK_MULTI_FRAME.get() && level.getBlockState(pos.above()).getBlock() == ModBlocks.BLOCK_MULTI_FRAME.get()) -// { -// return super.getStateForPlacement(blockPlaceContext).setValue(UP_DOWN_CONNECTION, true); -// } -// if(level.getBlockState(pos.north()).getBlock() == ModBlocks.BLOCK_MULTI_FRAME.get() && level.getBlockState(pos.south()).getBlock() == ModBlocks.BLOCK_MULTI_FRAME.get()) -// { -// return super.getStateForPlacement(blockPlaceContext).setValue(LEFT_RIGHT_CONNECTION, true); -// } -// if(level.getBlockState(pos.east()).getBlock() == ModBlocks.BLOCK_MULTI_FRAME.get() && level.getBlockState(pos.west()).getBlock() == ModBlocks.BLOCK_MULTI_FRAME.get()) -// { -// return super.getStateForPlacement(blockPlaceContext).setValue(LEFT_RIGHT_CONNECTION, true); -// } - - //TODO - return defaultBlockState(); - } - -// TODO Disabled by Rid - -// @Override -// protected void createBlockStateDefinition(StateDefinition.Builder builder) -// { -// builder.add(UP_DOWN_CONNECTION, LEFT_RIGHT_CONNECTION); -// } - @org.jetbrains.annotations.Nullable @Override public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) diff --git a/src/main/java/net/gigabit101/rebornstorage/client/CreativeTabRebornStorage.java b/src/main/java/net/gigabit101/rebornstorage/client/CreativeTabRebornStorage.java deleted file mode 100644 index abacdd0..0000000 --- a/src/main/java/net/gigabit101/rebornstorage/client/CreativeTabRebornStorage.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.gigabit101.rebornstorage.client; - -import net.gigabit101.rebornstorage.init.ModItems; -import net.gigabit101.rebornstorage.Constants; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; - -public class CreativeTabRebornStorage extends CreativeModeTab -{ - public static CreativeTabRebornStorage INSTANCE = new CreativeTabRebornStorage(); - - public CreativeTabRebornStorage() - { - super(Constants.MOD_ID); - } - - @Override - public ItemStack makeIcon() - { - return new ItemStack(ModItems.STORAGE_DISK_16384K.get()); - } -} diff --git a/src/main/java/net/gigabit101/rebornstorage/client/screens/AdvancedWirelessTransmitterScreen.java b/src/main/java/net/gigabit101/rebornstorage/client/screens/AdvancedWirelessTransmitterScreen.java index 1860c30..eb61dde 100644 --- a/src/main/java/net/gigabit101/rebornstorage/client/screens/AdvancedWirelessTransmitterScreen.java +++ b/src/main/java/net/gigabit101/rebornstorage/client/screens/AdvancedWirelessTransmitterScreen.java @@ -1,14 +1,13 @@ package net.gigabit101.rebornstorage.client.screens; -import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import net.gigabit101.rebornstorage.blockentities.BlockEntityAdvancedWirelessTransmitter; import net.gigabit101.rebornstorage.containers.AdvancedWirelessTransmitterContainer; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; public class AdvancedWirelessTransmitterScreen extends BaseScreen @@ -31,17 +30,17 @@ public void onPostInit(int i, int i1) public void tick(int i, int i1) {} @Override - public void renderBackground(PoseStack poseStack, int x, int y, int i2, int i3) + public void renderBackground(GuiGraphics guiGraphics, int x, int y, int i2, int i3) { - bindTexture(RS.ID, "gui/wireless_transmitter.png"); - blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); + ResourceLocation TEXTURE = new ResourceLocation("refinedstorage", "textures/gui/wireless_transmitter.png"); + guiGraphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack poseStack, int i, int i1) + public void renderForeground(GuiGraphics guiGraphics, int i, int i1) { - renderString(poseStack, 7, 7, title.getString()); - renderString(poseStack, 28, 25, I18n.get("gui.refinedstorage.wireless_transmitter.distance", container.getBlockEntity() != null ? container.getBlockEntity().getNode().getRange() : 0)); - renderString(poseStack, 7, 43, I18n.get("container.inventory")); + renderString(guiGraphics, 7, 7, title.getString()); + renderString(guiGraphics, 28, 25, I18n.get("gui.refinedstorage.wireless_transmitter.distance", container.getBlockEntity() != null ? container.getBlockEntity().getNode().getRange() : 0)); + renderString(guiGraphics, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/net/gigabit101/rebornstorage/client/screens/ScreenBuilder.java b/src/main/java/net/gigabit101/rebornstorage/client/screens/ScreenBuilder.java index c25cd6b..6770e67 100644 --- a/src/main/java/net/gigabit101/rebornstorage/client/screens/ScreenBuilder.java +++ b/src/main/java/net/gigabit101/rebornstorage/client/screens/ScreenBuilder.java @@ -3,6 +3,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.gigabit101.rebornstorage.Constants; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.resources.ResourceLocation; @@ -10,21 +11,18 @@ public class ScreenBuilder { public static final ResourceLocation GUI_SHEET = new ResourceLocation(Constants.MOD_ID.toLowerCase() + ":" + "textures/gui/gui_sheet.png"); - public void drawDefaultBackground(Screen gui, PoseStack matrixStack, int x, int y, int width, int height, int textureXSize, int textureYSize) + public void drawDefaultBackground(GuiGraphics guiGraphics, int x, int y, int width, int height, int textureXSize, int textureYSize) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, GUI_SHEET); - - gui.blit(matrixStack, x, y, 0, 0, width / 2, height / 2, textureXSize, textureYSize); - gui.blit(matrixStack, x + width / 2, y, 150 - width / 2, 0, width / 2, height / 2, textureXSize, textureYSize); - gui.blit(matrixStack, x, y + height / 2, 0, 150 - height / 2, width / 2, height / 2, textureXSize, textureYSize); - gui.blit(matrixStack, x + width / 2, y + height / 2, 150 - width / 2, 150 - height / 2, width / 2, height / 2, textureXSize, textureYSize); + guiGraphics.blit(GUI_SHEET, x, y, 0, 0, width / 2, height / 2, textureXSize, textureYSize); + guiGraphics.blit(GUI_SHEET, x + width / 2, y, 150 - width / 2, 0, width / 2, height / 2, textureXSize, textureYSize); + guiGraphics.blit(GUI_SHEET, x, y + height / 2, 0, 150 - height / 2, width / 2, height / 2, textureXSize, textureYSize); + guiGraphics.blit(GUI_SHEET, x + width / 2, y + height / 2, 150 - width / 2, 150 - height / 2, width / 2, height / 2, textureXSize, textureYSize); } - public void drawPlayerSlots(Screen gui, PoseStack matrixStack, int posX, int posY, boolean center, int textureXSize, int textureYSize) + public void drawPlayerSlots(GuiGraphics guiGraphics, int posX, int posY, boolean center, int textureXSize, int textureYSize) { - RenderSystem.setShaderTexture(0, GUI_SHEET); if (center) { posX -= 81; @@ -33,19 +31,18 @@ public void drawPlayerSlots(Screen gui, PoseStack matrixStack, int posX, int pos { for (int x = 0; x < 9; x++) { - gui.blit(matrixStack, posX + x * 18, posY + y * 18, 150, 0, 18, 18, textureXSize, textureYSize); + guiGraphics.blit(GUI_SHEET, posX + x * 18, posY + y * 18, 150, 0, 18, 18, textureXSize, textureYSize); } } for (int x = 0; x < 9; x++) { - gui.blit(matrixStack, posX + x * 18, posY + 58, 150, 0, 18, 18, textureXSize, textureYSize); + guiGraphics.blit(GUI_SHEET, posX + x * 18, posY + 58, 150, 0, 18, 18, textureXSize, textureYSize); } } - public void drawSlot(Screen gui, PoseStack matrixStack, int posX, int posY, int textureXSize, int textureYSize) + public void drawSlot(GuiGraphics guiGraphics, int posX, int posY, int textureXSize, int textureYSize) { - RenderSystem.setShaderTexture(0, GUI_SHEET); - gui.blit(matrixStack, posX, posY, 150, 0, 18, 18, textureXSize, textureYSize); + guiGraphics.blit(GUI_SHEET, posX, posY, 150, 0, 18, 18, textureXSize, textureYSize); } diff --git a/src/main/java/net/gigabit101/rebornstorage/client/screens/ScreenMultiCrafter.java b/src/main/java/net/gigabit101/rebornstorage/client/screens/ScreenMultiCrafter.java index 06615ac..7b4e9d8 100644 --- a/src/main/java/net/gigabit101/rebornstorage/client/screens/ScreenMultiCrafter.java +++ b/src/main/java/net/gigabit101/rebornstorage/client/screens/ScreenMultiCrafter.java @@ -5,6 +5,7 @@ import net.gigabit101.rebornstorage.multiblocks.MultiBlockCrafter; import net.gigabit101.rebornstorage.packet.PacketGui; import net.gigabit101.rebornstorage.packet.PacketHandler; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; @@ -34,7 +35,7 @@ public ScreenMultiCrafter(ContainerMultiCrafter containerMultiCrafter, Inventory public void init() { super.init(); - buttonNext = new Button(this.leftPos + 209, this.topPos + 172, 20, 20, Component.literal(">"), p_onPress_1_ -> + buttonNext = Button.builder(Component.literal(">"), p_93751_ -> { boolean shift = Screen.hasShiftDown(); int next = crafter.currentPage + 1; @@ -49,8 +50,9 @@ public void init() crafter.currentPage = next; if(containerMultiCrafter != null && containerMultiCrafter.blockPos != null) PacketHandler.sendToServer(new PacketGui(next, containerMultiCrafter.blockPos)); - }); - buttonBack = new Button(this.leftPos + 13, this.topPos + 172, 20, 20, Component.literal("<"), p_onPress_1_ -> + }).pos(this.leftPos + 209, this.topPos + 172).size(20, 20).build(); + + buttonBack = Button.builder(Component.literal("<"), p_93751_ -> { boolean shift = Screen.hasShiftDown(); int next = crafter.currentPage - 1; @@ -65,7 +67,8 @@ public void init() crafter.currentPage = next; if(containerMultiCrafter != null && containerMultiCrafter.blockPos != null) PacketHandler.sendToServer(new PacketGui(next, containerMultiCrafter.blockPos)); - }); + }).pos(this.leftPos + 13, this.topPos + 172).size(20, 20).build(); + addRenderableWidget(buttonBack); addRenderableWidget(buttonNext); @@ -86,41 +89,41 @@ public void init() } @Override - protected void renderLabels(PoseStack poseStack, int mouseX, int mouseY) + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { - this.font.draw(poseStack, this.title, (float) this.titleLabelX, (float) this.titleLabelY, 4210752); - this.font.draw(poseStack, this.playerInventoryTitle, (float) this.inventoryLabelX, (float) this.inventoryLabelY, 4210752); + guiGraphics.drawString(font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + guiGraphics.drawString(font, this.playerInventoryTitle, this.inventoryLabelX, this.inventoryLabelY, 4210752, false); } @Override - public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(matrixStack); - super.render(matrixStack, mouseX, mouseY, partialTicks); - this.renderTooltip(matrixStack, mouseX, mouseY); + this.renderBackground(guiGraphics); + super.render(guiGraphics, mouseX, mouseY, partialTicks); + this.renderTooltip(guiGraphics, mouseX, mouseY); - this.font.draw(matrixStack, Component.literal("Page " + crafter.currentPage + " of " + crafter.invs.size()), leftPos + 10, topPos + 224, 4210752); + guiGraphics.drawString(font, Component.literal("Page " + crafter.currentPage + " of " + crafter.invs.size()), leftPos + 10, topPos + 224, 4210752, false); if(buttonNext.isMouseOver(mouseX, mouseY) || buttonBack.isMouseOver(mouseX, mouseY)) { - renderTooltip(matrixStack, Component.literal("Hold to increment by 10"), mouseX, mouseY); + guiGraphics.renderTooltip(font, Component.literal("Hold to increment by 10"), mouseX, mouseY); } } @Override - public void renderBg(PoseStack matrixStack, float partialTicks, int x, int y) + public void renderBg(GuiGraphics guiGraphics, float partialTicks, int x, int y) { - builder.drawDefaultBackground(this, matrixStack, leftPos, topPos, getXSize(), getYSize(), 256, 256); - builder.drawPlayerSlots(this, matrixStack, leftPos + getXSize() / 2, topPos + 140, true, 256, 256); + builder.drawDefaultBackground(guiGraphics, leftPos, topPos, getXSize(), getYSize(), 256, 256); + builder.drawPlayerSlots(guiGraphics, leftPos + getXSize() / 2, topPos + 140, true, 256, 256); if (crafter != null) { if (crafter.invs.size() > 0 && crafter.currentPage <= crafter.invs.size()) { - drawSlots(13, 6, maxSlotsPerPage, matrixStack); + drawSlots(13, 6, maxSlotsPerPage, guiGraphics); } } } - public void drawSlots(int col, int rows, int max, PoseStack matrixStack) + public void drawSlots(int col, int rows, int max, GuiGraphics guiGraphics) { int i = 0; for (int y = 0; y < rows; y++) @@ -128,7 +131,7 @@ public void drawSlots(int col, int rows, int max, PoseStack matrixStack) for (int x = 0; x < col; x++) { i++; - if (i <= max) builder.drawSlot(this, matrixStack, leftPos + 8 + x * 18, topPos + 20 + y * 18, 256, 256); + if (i <= max) builder.drawSlot(guiGraphics, leftPos + 8 + x * 18, topPos + 20 + y * 18, 256, 256); } } } diff --git a/src/main/java/net/gigabit101/rebornstorage/containers/ContainerBase.java b/src/main/java/net/gigabit101/rebornstorage/containers/ContainerBase.java index 567e22d..8b9908d 100644 --- a/src/main/java/net/gigabit101/rebornstorage/containers/ContainerBase.java +++ b/src/main/java/net/gigabit101/rebornstorage/containers/ContainerBase.java @@ -45,8 +45,8 @@ public boolean stillValid(Player player) public static boolean canStacksMerge(ItemStack stack1, ItemStack stack2) { if (stack1.isEmpty() || stack2.isEmpty()) return false; - if (!stack1.sameItem(stack2)) return false; - if (!ItemStack.tagMatches(stack1, stack2)) return false; + if (!ItemStack.matches(stack1, stack2)) return false; + if (!ItemStack.isSameItemSameTags(stack1, stack2)) return false; return true; } diff --git a/src/main/java/net/gigabit101/rebornstorage/containers/ContainerMultiCrafter.java b/src/main/java/net/gigabit101/rebornstorage/containers/ContainerMultiCrafter.java index ada2b94..a49416d 100644 --- a/src/main/java/net/gigabit101/rebornstorage/containers/ContainerMultiCrafter.java +++ b/src/main/java/net/gigabit101/rebornstorage/containers/ContainerMultiCrafter.java @@ -32,7 +32,7 @@ public ContainerMultiCrafter(int id, Inventory playerInv, FriendlyByteBuf extraD public ContainerMultiCrafter(int id, Inventory playerInv, BlockEntityMultiCrafter multiBlockCrafter) { super(ModContainers.MULTI_CRAFTER_CONTAINER.get(), id); - Level level = playerInv.player.level; + Level level = playerInv.player.level(); crafter = RebornStorage.getMultiBlock(level, multiBlockCrafter.getBlockPos()); if(level.isClientSide) { @@ -56,7 +56,7 @@ public ContainerMultiCrafter(int id, Inventory playerInv, BlockEntityMultiCrafte drawSlotsForPage(crafter.getInvForPage(crafter.currentPage)); } else { - if(!playerInv.player.level.isClientSide) + if(!playerInv.player.level().isClientSide) { RebornStorage.logger.error("currentPage is out of bounds, Resetting to 1"); crafter.currentPage = 1; diff --git a/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGrid.java b/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGrid.java index 600a3e0..6dbf566 100644 --- a/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGrid.java +++ b/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGrid.java @@ -10,6 +10,7 @@ import com.refinedmods.refinedstorage.inventory.player.PlayerSlot; import com.refinedmods.refinedstorage.util.StackUtils; import net.gigabit101.rebornstorage.RebornStorage; +import net.minecraft.core.RegistryAccess; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.server.MinecraftServer; @@ -20,6 +21,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.inventory.ResultContainer; +import net.minecraft.world.inventory.TransientCraftingContainer; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.item.crafting.RecipeType; @@ -64,7 +66,7 @@ public void slotsChanged(@NotNull Container container) }; private CraftingRecipe currentRecipe; - private final CraftingContainer craftingContainer = new CraftingContainer(craftingMenu, 3, 3) + private final CraftingContainer craftingContainer = new TransientCraftingContainer(craftingMenu, 3, 3) { @Override public void setChanged() @@ -135,7 +137,7 @@ public void onCraftingMatrixChanged() craftingResultContainer.setItem(0, ItemStack.EMPTY); } else { - craftingResultContainer.setItem(0, currentRecipe.assemble(craftingContainer)); + craftingResultContainer.setItem(0, currentRecipe.assemble(craftingContainer, RegistryAccess.EMPTY)); } listeners.forEach(ICraftingGridListener::onCraftingMatrixChanged); diff --git a/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGridGridFactory.java b/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGridGridFactory.java index cbe4c70..df315c8 100644 --- a/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGridGridFactory.java +++ b/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGridGridFactory.java @@ -23,7 +23,7 @@ public class WirelessCraftingGridGridFactory implements IGridFactory @Override public IGrid createFromStack(Player player, ItemStack stack, PlayerSlot slot) { - return new WirelessCraftingGrid(stack, player.getLevel(), player.getServer(), slot); + return new WirelessCraftingGrid(stack, player.level(), player.getServer(), slot); } @Nullable diff --git a/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGridNetworkItem.java b/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGridNetworkItem.java index ae3077b..df00035 100644 --- a/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGridNetworkItem.java +++ b/src/main/java/net/gigabit101/rebornstorage/grid/crafting/WirelessCraftingGridNetworkItem.java @@ -13,7 +13,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.energy.IEnergyStorage; public class WirelessCraftingGridNetworkItem implements INetworkItem @@ -41,7 +41,7 @@ public Player getPlayer() @Override public boolean onOpen(INetwork network) { - IEnergyStorage energy = stack.getCapability(CapabilityEnergy.ENERGY, null).orElse(null); + IEnergyStorage energy = stack.getCapability(ForgeCapabilities.ENERGY, null).orElse(null); if (((ItemWirelessGrid) stack.getItem()).getType() != ItemWirelessGrid.Type.CREATIVE && energy != null && energy.getEnergyStored() <= RS.SERVER_CONFIG.getWirelessFluidGrid().getOpenUsage()) @@ -72,7 +72,7 @@ private void sendOutOfEnergyMessage() { public void drainEnergy(int energy) { if (RS.SERVER_CONFIG.getWirelessGrid().getUseEnergy() && ((ItemWirelessGrid)this.stack.getItem()).getType() != ItemWirelessGrid.Type.CREATIVE) { - this.stack.getCapability(CapabilityEnergy.ENERGY).ifPresent((energyStorage) -> { + this.stack.getCapability(ForgeCapabilities.ENERGY).ifPresent((energyStorage) -> { energyStorage.extractEnergy(energy, false); if (energyStorage.getEnergyStored() <= 0) { this.handler.close(this.player); diff --git a/src/main/java/net/gigabit101/rebornstorage/grid/fluid/WirelessFluidGridNetworkItemExt.java b/src/main/java/net/gigabit101/rebornstorage/grid/fluid/WirelessFluidGridNetworkItemExt.java index 89ec13c..25b1f16 100644 --- a/src/main/java/net/gigabit101/rebornstorage/grid/fluid/WirelessFluidGridNetworkItemExt.java +++ b/src/main/java/net/gigabit101/rebornstorage/grid/fluid/WirelessFluidGridNetworkItemExt.java @@ -14,7 +14,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.energy.IEnergyStorage; public class WirelessFluidGridNetworkItemExt extends WirelessFluidGridNetworkItem @@ -34,7 +34,7 @@ public WirelessFluidGridNetworkItemExt(INetworkItemManager handler, Player playe } public boolean onOpen(INetwork network) { - IEnergyStorage energy = stack.getCapability(CapabilityEnergy.ENERGY, null).orElse(null); + IEnergyStorage energy = stack.getCapability(ForgeCapabilities.ENERGY, null).orElse(null); if (RS.SERVER_CONFIG.getWirelessFluidGrid().getUseEnergy() && ((ItemWirelessGrid)this.stack.getItem()).getType() != ItemWirelessGrid.Type.CREATIVE && energy != null && energy.getEnergyStored() <= RS.SERVER_CONFIG.getWirelessFluidGrid().getOpenUsage()) { this.sendOutOfEnergyMessage(); return false; @@ -52,7 +52,7 @@ public boolean onOpen(INetwork network) { public void drainEnergy(int energy) { if (RS.SERVER_CONFIG.getWirelessFluidGrid().getUseEnergy() && ((ItemWirelessGrid)this.stack.getItem()).getType() != ItemWirelessGrid.Type.CREATIVE) { - this.stack.getCapability(CapabilityEnergy.ENERGY).ifPresent((energyStorage) -> { + this.stack.getCapability(ForgeCapabilities.ENERGY).ifPresent((energyStorage) -> { energyStorage.extractEnergy(energy, false); if (energyStorage.getEnergyStored() <= 0) { this.handler.close(this.player); diff --git a/src/main/java/net/gigabit101/rebornstorage/grid/monitor/WirelessCraftingMonitorNetworkItemExt.java b/src/main/java/net/gigabit101/rebornstorage/grid/monitor/WirelessCraftingMonitorNetworkItemExt.java index 00cc613..655003b 100644 --- a/src/main/java/net/gigabit101/rebornstorage/grid/monitor/WirelessCraftingMonitorNetworkItemExt.java +++ b/src/main/java/net/gigabit101/rebornstorage/grid/monitor/WirelessCraftingMonitorNetworkItemExt.java @@ -17,7 +17,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.network.NetworkHooks; @@ -42,7 +42,7 @@ public WirelessCraftingMonitorNetworkItemExt(INetworkItemManager handler, Player @Override public boolean onOpen(INetwork network) { - IEnergyStorage energy = stack.getCapability(CapabilityEnergy.ENERGY, null).orElse(null); + IEnergyStorage energy = stack.getCapability(ForgeCapabilities.ENERGY, null).orElse(null); if (RS.SERVER_CONFIG.getWirelessCraftingMonitor().getUseEnergy() && ((ItemWirelessGrid)this.stack.getItem()).getType() != ItemWirelessGrid.Type.CREATIVE && energy != null && energy.getEnergyStored() <= RS.SERVER_CONFIG.getWirelessCraftingMonitor().getOpenUsage()) { this.sendOutOfEnergyMessage(); return false; @@ -65,7 +65,7 @@ public boolean onOpen(INetwork network) public void drainEnergy(int energy) { if (RS.SERVER_CONFIG.getWirelessCraftingMonitor().getUseEnergy() && ((ItemWirelessGrid)this.stack.getItem()).getType() != ItemWirelessGrid.Type.CREATIVE) { - this.stack.getCapability(CapabilityEnergy.ENERGY).ifPresent((energyStorage) -> { + this.stack.getCapability(ForgeCapabilities.ENERGY).ifPresent((energyStorage) -> { energyStorage.extractEnergy(energy, false); if (energyStorage.getEnergyStored() <= 0) { this.handler.close(this.player); diff --git a/src/main/java/net/gigabit101/rebornstorage/init/ModItems.java b/src/main/java/net/gigabit101/rebornstorage/init/ModItems.java index 57a789a..67b50ca 100644 --- a/src/main/java/net/gigabit101/rebornstorage/init/ModItems.java +++ b/src/main/java/net/gigabit101/rebornstorage/init/ModItems.java @@ -3,8 +3,6 @@ import com.refinedmods.refinedstorage.api.storage.StorageType; import com.refinedmods.refinedstorage.block.BaseBlock; import com.refinedmods.refinedstorage.item.blockitem.BaseBlockItem; -import net.gigabit101.rebornstorage.client.CreativeTabRebornStorage; -import net.gigabit101.rebornstorage.items.ItemBook; import net.gigabit101.rebornstorage.items.ItemWirelessGrid; import net.gigabit101.rebornstorage.items.ItemFluidRebornStorageCell; import net.gigabit101.rebornstorage.items.ItemRebornStorageCell; @@ -18,9 +16,9 @@ public class ModItems { - public static final Item.Properties ITEM_GROUP = new Item.Properties().tab(CreativeTabRebornStorage.INSTANCE); + public static final Item.Properties ITEM_GROUP = new Item.Properties(); public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Constants.MOD_ID); - public static final Item.Properties PROPERTIES = new Item.Properties().tab(CreativeTabRebornStorage.INSTANCE); + public static final Item.Properties PROPERTIES = new Item.Properties(); // public static final RegistryObject BOOK = ITEMS.register("rs_book", () -> new ItemBook()); diff --git a/src/main/java/net/gigabit101/rebornstorage/items/ItemBook.java b/src/main/java/net/gigabit101/rebornstorage/items/ItemBook.java index 7289e3d..4e5774b 100644 --- a/src/main/java/net/gigabit101/rebornstorage/items/ItemBook.java +++ b/src/main/java/net/gigabit101/rebornstorage/items/ItemBook.java @@ -1,8 +1,5 @@ package net.gigabit101.rebornstorage.items; -import net.gigabit101.rebornstorage.client.CreativeTabRebornStorage; -import net.gigabit101.rebornstorage.init.ModItems; -import net.minecraft.core.Registry; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -10,13 +7,12 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import vazkii.patchouli.api.PatchouliAPI; public class ItemBook extends Item { public ItemBook() { - super(new Properties().tab(CreativeTabRebornStorage.INSTANCE).stacksTo(1)); + super(new Properties().stacksTo(1)); } @Override @@ -26,7 +22,8 @@ public InteractionResultHolder use(Level level, Player player, Intera if(player instanceof ServerPlayer serverPlayer) { - PatchouliAPI.get().openBookGUI(serverPlayer, Registry.ITEM.getKey(this)); + //Not updated yet +// PatchouliAPI.get().openBookGUI(serverPlayer, Registry.ITEM.getKey(this)); } return InteractionResultHolder.success(stack); } diff --git a/src/main/java/net/gigabit101/rebornstorage/items/ItemFluidRebornStorageCell.java b/src/main/java/net/gigabit101/rebornstorage/items/ItemFluidRebornStorageCell.java index de6bf4f..2fdebae 100644 --- a/src/main/java/net/gigabit101/rebornstorage/items/ItemFluidRebornStorageCell.java +++ b/src/main/java/net/gigabit101/rebornstorage/items/ItemFluidRebornStorageCell.java @@ -4,9 +4,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; import com.refinedmods.refinedstorage.apiimpl.API; -import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; import com.refinedmods.refinedstorage.render.Styles; -import net.gigabit101.rebornstorage.client.CreativeTabRebornStorage; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; @@ -28,7 +26,7 @@ public class ItemFluidRebornStorageCell extends Item implements IStorageDiskProv public ItemFluidRebornStorageCell(int capacity, StorageType storageType) { - super(new Properties().tab(CreativeTabRebornStorage.INSTANCE).stacksTo(1)); + super(new Properties().stacksTo(1)); this.capacity = capacity; } diff --git a/src/main/java/net/gigabit101/rebornstorage/items/ItemRebornStorageCell.java b/src/main/java/net/gigabit101/rebornstorage/items/ItemRebornStorageCell.java index 3993d57..0595b77 100644 --- a/src/main/java/net/gigabit101/rebornstorage/items/ItemRebornStorageCell.java +++ b/src/main/java/net/gigabit101/rebornstorage/items/ItemRebornStorageCell.java @@ -5,7 +5,6 @@ import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.render.Styles; -import net.gigabit101.rebornstorage.client.CreativeTabRebornStorage; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; @@ -28,7 +27,7 @@ public class ItemRebornStorageCell extends Item implements IStorageDiskProvider public ItemRebornStorageCell(int capacity, StorageType storageType) { - super(new Item.Properties().tab(CreativeTabRebornStorage.INSTANCE).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); this.capacity = capacity; this.storageType = storageType; } diff --git a/src/main/java/net/gigabit101/rebornstorage/packet/PacketChangeMode.java b/src/main/java/net/gigabit101/rebornstorage/packet/PacketChangeMode.java index 03aa1e1..31b3982 100644 --- a/src/main/java/net/gigabit101/rebornstorage/packet/PacketChangeMode.java +++ b/src/main/java/net/gigabit101/rebornstorage/packet/PacketChangeMode.java @@ -82,7 +82,7 @@ public static void handle(final PacketChangeMode message, Supplier 0) @@ -53,7 +53,7 @@ public static void handle(final PacketGui message, Supplier