Skip to content

Commit

Permalink
Merge pull request #196 from SkpC9/main
Browse files Browse the repository at this point in the history
Make it compatible with Titanium 3.8.1
  • Loading branch information
Buuz135 authored Jul 17, 2023
2 parents c8c6242 + 6797b0a commit 666cd01
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle'

group = 'com.buuz135'
version = '1.20.1-1.2.0'
version = '1.20.1-1.2.1'

java {
archivesBaseName = 'functionalstorage'
Expand Down Expand Up @@ -93,7 +93,7 @@ repositories {
dependencies {

minecraft 'net.minecraftforge:forge:1.20.1-47.0.19'
implementation fg.deobf(project.dependencies.create('com.hrznstudio:titanium:1.20.1-3.8.0-8'))
implementation fg.deobf(project.dependencies.create('com.hrznstudio:titanium:1.20.1-3.8.1-9'))
compileOnly fg.deobf("mezz.jei:jei-1.20.1-common-api:15.1.0.19")
compileOnly fg.deobf("mezz.jei:jei-1.20.1-forge-api:15.1.0.19")
// at runtime, use the full JEI jar for Forge
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rootProject.name = 'functionalstorage'
rootProject.name = 'FunctionalStorage'
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,12 @@ protected void initModules() {
var name = woodType.getName() + "_" + value.getSlots();
if (woodType == DrawerWoodType.FRAMED){
var pair = getRegistries().registerBlockWithTileItem(name, () -> new FramedDrawerBlock(value), blockRegistryObject -> () ->
new DrawerBlock.DrawerItem((DrawerBlock) blockRegistryObject.get(), new Item.Properties(), TAB));
new DrawerBlock.DrawerItem((DrawerBlock) blockRegistryObject.get(), new Item.Properties(), TAB),TAB);
DRAWER_TYPES.computeIfAbsent(value, drawerType -> new ArrayList<>()).add(pair);
CompactingFramedDrawerBlock.FRAMED.add(pair.getLeft());
} else {
DRAWER_TYPES.computeIfAbsent(value, drawerType -> new ArrayList<>()).add(getRegistries().registerBlockWithTileItem(name, () -> new DrawerBlock(woodType, value, BlockBehaviour.Properties.copy(woodType.getPlanks())), blockRegistryObject -> () ->
new DrawerBlock.DrawerItem((DrawerBlock) blockRegistryObject.get(), new Item.Properties(), TAB)));
new DrawerBlock.DrawerItem((DrawerBlock) blockRegistryObject.get(), new Item.Properties(), TAB),TAB));
}
}
}
Expand Down

0 comments on commit 666cd01

Please sign in to comment.