Skip to content

Commit

Permalink
Update to 1.20.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Leronus committed Jun 27, 2024
1 parent 4ad814d commit f3e8ad4
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 45 deletions.
24 changes: 12 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.5-SNAPSHOT'
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'maven-publish'
}

Expand Down Expand Up @@ -65,36 +65,36 @@ dependencies {
// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modImplementation "maven.modrinth:sodium:mc1.20.1-0.5.3"
modImplementation "maven.modrinth:lithium:mc1.20.1-0.11.2"
modImplementation "maven.modrinth:sodium:${project.sodium_version}"
modImplementation "maven.modrinth:lithium:${project.lithium_version}"

//Iris
modImplementation "maven.modrinth:YL57xq9U:ogjxrwGQ"
modImplementation "maven.modrinth:YL57xq9U:Cjwm9s3i"
//Indium
modImplementation "maven.modrinth:Orvt0mRa:Lue6O9z9"
modImplementation "maven.modrinth:Orvt0mRa:tD2IqHXC"
//EntityCulling
modImplementation "maven.modrinth:NNAgCjsB:BDwHAdWc"
modImplementation "maven.modrinth:NNAgCjsB:KRGWwoZW"
//Continuity
modImplementation "maven.modrinth:1IjD5062:Z9FJWLMt"
modImplementation "maven.modrinth:1IjD5062:Ox1racg8"
// //Bobby
// modImplementation "maven.modrinth:M08ruV16:2cuVyTav"
//Nvidium
modImplementation "maven.modrinth:SfMw2IZN:UO1crPGk"

//Custom Shields
modImplementation "com.github.CrimsonDawn45:Fabric-Shield-Lib:v${project.fabric_shield_lib_version}"
modImplementation "maven.modrinth:7SDalH12:xY16zX6k"
modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
modImplementation "com.github.Chocohead:Fabric-ASM:v${project.fabricasm_version}"

//CustomPortalAPI
modImplementation 'net.kyrptonaught:customportalapi:0.0.1-beta64-1.20'
include 'net.kyrptonaught:customportalapi:0.0.1-beta64-1.20'
// modImplementation 'net.kyrptonaught:customportalapi:0.0.1-beta64-1.20'
// include 'net.kyrptonaught:customportalapi:0.0.1-beta64-1.20'

modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"

//XRay
modImplementation "curse.maven:advanced-xray-fabric-edition-444663:4595168"
// //XRay
// modImplementation "curse.maven:advanced-xray-fabric-edition-444663:4595168"
}

processResources {
Expand Down
19 changes: 10 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.15.3
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.4
loader_version=0.15.11

# Mod Properties
mod_version=1.0.1
mod_version=1.2.0
maven_group=mod.leronus.mores
archives_base_name=mores

# Dependencies
fabric_version=0.91.0+1.20.1
sodium_version=mc1.20.1-0.5.3
fabric_version=0.91.6+1.20.2
sodium_version=mc1.20.2-0.5.5
lithium_version=mc1.20.2-0.12.0

fabric_shield_lib_version=1.7.2-1.20.1
midnightlib_version=1.4.1-fabric
mod_menu_version=7.2.2
fabric_shield_lib_version=1.7.2-1.20.2
midnightlib_version=1.5.0-fabric
mod_menu_version=8.0.1
fabricasm_version=2.3
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
42 changes: 21 additions & 21 deletions src/main/java/mod/leronus/mores/Mores.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import mod.leronus.mores.world.gen.ModWorldGeneration;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.registry.FuelRegistry;
import net.kyrptonaught.customportalapi.api.CustomPortalBuilder;
//import net.kyrptonaught.customportalapi.api.CustomPortalBuilder;
import net.minecraft.util.Identifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -39,25 +39,25 @@ public void onInitialize() {

ModWorldGeneration.generateModWorldGen();

CustomPortalBuilder.beginPortal()
.frameBlock(ModBlocks.SILVER_BLOCK)
.lightWithItem(ModItems.ANTHRACITE)
.destDimID(new Identifier(Mores.MOD_ID, "reloaded"))
.tintColor(14188952)
.registerPortal();

CustomPortalBuilder.beginPortal()
.frameBlock(ModBlocks.RUBY_BLOCK)
.lightWithItem(ModItems.ANTHRACITE)
.destDimID(new Identifier(Mores.MOD_ID, "reloaded"))
.tintColor(13061821)
.registerPortal();

CustomPortalBuilder.beginPortal()
.frameBlock(ModBlocks.ONYX_BLOCK)
.lightWithItem(ModItems.ANTHRACITE)
.destDimID(new Identifier("the_end"))
.tintColor(4408131)
.registerPortal();
// CustomPortalBuilder.beginPortal()
// .frameBlock(ModBlocks.SILVER_BLOCK)
// .lightWithItem(ModItems.ANTHRACITE)
// .destDimID(new Identifier(Mores.MOD_ID, "reloaded"))
// .tintColor(14188952)
// .registerPortal();
//
// CustomPortalBuilder.beginPortal()
// .frameBlock(ModBlocks.RUBY_BLOCK)
// .lightWithItem(ModItems.ANTHRACITE)
// .destDimID(new Identifier(Mores.MOD_ID, "reloaded"))
// .tintColor(13061821)
// .registerPortal();
//
// CustomPortalBuilder.beginPortal()
// .frameBlock(ModBlocks.ONYX_BLOCK)
// .lightWithItem(ModItems.ANTHRACITE)
// .destDimID(new Identifier("the_end"))
// .tintColor(4408131)
// .registerPortal();
}
}
5 changes: 3 additions & 2 deletions src/main/java/mod/leronus/mores/mixin/BlockMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.minecraft.entity.Entity;
import net.minecraft.inventory.SimpleInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.RecipeEntry;
import net.minecraft.recipe.RecipeType;
import net.minecraft.recipe.SmeltingRecipe;
import net.minecraft.server.world.ServerWorld;
Expand Down Expand Up @@ -36,10 +37,10 @@ private static void getDroppedStacks(BlockState state, ServerWorld world, BlockP
}
for (ItemStack itemStack : returnValue) {
// Optional<SmeltingRecipe> recipe = world.getRecipeManager().listAllOfType(RecipeType.SMELTING).stream().filter((smeltingRecipe -> smeltingRecipe.getPreviewInputs().get(0).test(itemStack))).findFirst();
Optional<SmeltingRecipe> recipe = world.getRecipeManager().getFirstMatch(RecipeType.SMELTING, new SimpleInventory(itemStack), world);
Optional<RecipeEntry<SmeltingRecipe>> recipe = world.getRecipeManager().getFirstMatch(RecipeType.SMELTING, new SimpleInventory(itemStack), world);

if (recipe.isPresent()) {
ItemStack smelted = recipe.get().getOutput(world.getRegistryManager()).copy();
ItemStack smelted = recipe.get().value().getResult(world.getRegistryManager()).copy();
smelted.setCount(itemStack.getCount());
items.add(smelted);
} else {
Expand Down

0 comments on commit f3e8ad4

Please sign in to comment.