Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
JustAHuman-xD committed Dec 17, 2023
1 parent d6cd3cd commit 3feb2ab
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 32 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api")
}

modImplementation("mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}") {
modImplementation("mezz.jei:jei-${project.jei_version}") {
exclude(group: "mezz.jei")
}

Expand Down
31 changes: 17 additions & 14 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,42 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.20.2
yarn_mappings=1.20.1+build.4
loader_version=0.14.22
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
loader_version=0.15.2

# Mod Properties
mod_version=0.3.1-beta
mod_version=0.3.2-beta
maven_group=me.justahuman
archives_base_name=Slimefun Essentials

# Dependencies
# check this on https://modmuss50.me/fabric.html
fabric_version=0.90.0+1.20.2
fabric_version=0.91.3+1.20.4

# https://github.com/emilyploszaj/emi/releases
emi_version=1.0.22+1.20.1
emi_version=1.0.28+1.20.2

# https://www.curseforge.com/minecraft/mc-mods/jei/files
jei_version=16.0.0.28
# https://www.curseforge.com/minecraft/mc-mods/jei/files?page=1&pageSize=20&gameVersionTypeId=4&showAlphaFiles=show
jei_version=1.20.2-fabric:16.0.0.28

# https://linkie.shedaniel.me/dependencies?loader=fabric&version=1.20.1#dep-2
rei_version=12.0.665
# https://linkie.shedaniel.dev/dependencies?loader=fabric
rei_version=14.0.687

# https://www.curseforge.com/minecraft/mc-mods/jade/files/all?filter-status=1&filter-game-version=2020709689%3A7498
jade_version=4768565
# https://www.curseforge.com/minecraft/mc-mods/jade/files?page=1&pageSize=20&gameVersionTypeId=4
jade_version=4957713

# https://jitpack.io/#JustAHuman-xD/MoreBlockPredicates
mbp_version=1.20-fixed-SNAPSHOT

# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/
mod_menu_version=8.0.0
mod_menu_version=9.0.0-pre.1

# https://modrinth.com/mod/cloth-config/versions
cloth_config_version=12.0.109
cloth_config_version=13.0.114

# https://www.curseforge.com/minecraft/mc-mods/architectury-api/files?page=1&pageSize=20&gameVersionTypeId=4
architectury_version=11.0.8

# https://projectlombok.org/setup/gradle
lombok_version=1.18.30
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void reload(ResourceManager manager) {
}));
}

if (ModConfig.customBlockFeatures()) {
if (ModConfig.blockFeatures()) {
ClientChunkEvents.CHUNK_LOAD.register(((world, chunk) -> {
final PacketByteBuf packetByteBuf = PacketByteBufs.create();
final ChunkPos chunkPos = chunk.getPos();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package me.justahuman.slimefun_essentials.compat.rei;

import dev.architectury.hooks.item.ItemStackHooks;
import dev.architectury.utils.Env;
import dev.architectury.utils.EnvExecutor;
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
import it.unimi.dsi.fastutil.objects.ReferenceSet;
import me.justahuman.slimefun_essentials.client.SlimefunItemStack;
Expand Down Expand Up @@ -35,17 +32,7 @@
import java.util.stream.Stream;

public class SlimefunEntryDefinition implements EntryDefinition<SlimefunItemStack> {
private EntryRenderer<SlimefunItemStack> renderer;

public SlimefunEntryDefinition() {
EnvExecutor.runInEnv(Env.CLIENT, () -> () -> Client.init(this));
}

private static class Client {
private static void init(SlimefunEntryDefinition definition) {
definition.renderer = new SlimefunItemStackRenderer();
}
}
private final EntryRenderer<SlimefunItemStack> renderer = new SlimefunItemStackRenderer();

@Override
public Class<SlimefunItemStack> getValueType() {
Expand Down Expand Up @@ -97,7 +84,7 @@ public ItemStack cheatsAs(EntryStack<SlimefunItemStack> entry, SlimefunItemStack
@Nullable
@Override
public SlimefunItemStack add(SlimefunItemStack o1, SlimefunItemStack o2) {
return new SlimefunItemStack(o1.id(), ItemStackHooks.copyWithCount(o1.itemStack(), o1.itemStack().getCount() + o2.itemStack().getCount()));
return new SlimefunItemStack(o1.id(), o1.itemStack().copyWithCount(o1.itemStack().getCount() + o2.itemStack().getCount()));
}

@Override
Expand Down Expand Up @@ -194,7 +181,9 @@ public void renderOverlay(EntryStack<SlimefunItemStack> entry, BakedModel model,
}

@Override
public void endBatch(EntryStack<SlimefunItemStack> entry, BakedModel model, DrawContext graphics, float delta) {}
public void endBatch(EntryStack<SlimefunItemStack> entry, BakedModel model, DrawContext graphics, float delta) {
itemStackEntryRenderer.endBatch(ReiIntegration.unwrap(entry), model, graphics, delta);
}

@Override
@Nullable
Expand Down

0 comments on commit 3feb2ab

Please sign in to comment.