Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
54ce687
Merge pull request #16 from Minecraft-LightLand/squad
D12epic Nov 6, 2023
ff8e9ac
Merge pull request #17 from Minecraft-LightLand/squad
D12epic Nov 11, 2023
1550661
Merge pull request #18 from Minecraft-LightLand/cataclysm
D12epic Mar 12, 2024
b5f49c3
Animate Rebuilded
Apr 8, 2024
4e36146
Animate Rebuilded
Apr 16, 2024
3cd42e2
Animate Rebuilded
Apr 16, 2024
ab0a1bf
Animate Rebuilded
Apr 19, 2024
080c2cf
Animate Rebuilded
Apr 19, 2024
b1d8c5f
Animate Rebuilded
Apr 22, 2024
a80237c
Animate Rebuilded
May 9, 2024
0a8ef45
Animate Rebuilded
May 10, 2024
3186bbc
Animate Rebuilded
May 10, 2024
d9ff501
Animate Rebuilded
May 10, 2024
2ffd6d1
Animate Rebuilded
May 10, 2024
bdea4c3
Animate Rebuilded
May 10, 2024
54f55b3
Animate Rebuilded
May 10, 2024
5dd1945
Animate Rebuilded
May 10, 2024
601d87d
Animate Rebuilded
May 11, 2024
c2c0050
Animate Rebuilded
May 11, 2024
60445cf
Animate Rebuilded
May 12, 2024
971ce50
Animate Rebuilded
May 14, 2024
4c5eafd
Animate Rebuilded
May 15, 2024
6bb9a91
Animate Rebuilded
May 15, 2024
38de6d5
Animate Rebuilded
May 15, 2024
22e916b
Animate Rebuilded
May 15, 2024
7c86e61
Animate Rebuilded
May 16, 2024
3a848c8
Animate Rebuilded
May 16, 2024
92aedf8
Animate Rebuilded
May 16, 2024
72cc581
Animate Rebuilded
May 16, 2024
ac0a1af
Animate Rebuilded
May 16, 2024
2dd5e82
Animate Rebuilded
May 16, 2024
22e1f10
Animate Rebuilded
May 16, 2024
ec57aa5
Animate Rebuilded
May 16, 2024
34a7052
Merge branch 'Minecraft-LightLand:1.20' into D12's_1.20.1(AnimateRebu…
D12epic Jun 11, 2024
3688abd
Merge branch 'Minecraft-LightLand:1.20' into D12's_1.20.1(AnimateRebu…
D12epic Jul 27, 2024
29c7587
Merge branch 'Minecraft-LightLand:1.20' into D12's_1.20.1(AnimateRebu…
D12epic Jul 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ buildscript {
plugins {
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
}
plugins {
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
}

apply plugin: 'maven-publish'
apply plugin: 'org.spongepowered.mixin'
Expand All @@ -27,8 +30,7 @@ if (lljij.toBoolean()) jarJar.enable()
java.toolchain.languageVersion = JavaLanguageVersion.of(17)

minecraft {
//mappings channel: 'parchment', version: '1.19.3-2023.03.12-1.19.4'
mappings channel: 'official', version: "${minecraft_version}"
mappings channel: 'parchment', version: '2023.06.26-1.20.1'
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
runs {
client {
Expand Down
3 changes: 2 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
pluginManagement {
repositories {
maven { url = 'https://maven.parchmentmc.org' }
gradlePluginPortal()
maven {
name="MinecraftForge"
url = 'https://maven.minecraftforge.net/' }
url = 'https://maven.minecraftforge.net/'}
}
}
plugins {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package dev.xkmc.modulargolems.compat.curio;

import com.mojang.datafixers.util.Pair;
import com.tterrag.registrate.util.entry.MenuEntry;
import dev.xkmc.l2tabs.compat.CuriosEventHandler;
import dev.xkmc.l2tabs.init.data.L2TabsLangData;
Expand All @@ -14,7 +13,6 @@
import dev.xkmc.modulargolems.init.ModularGolems;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.network.NetworkHooks;
Expand Down Expand Up @@ -87,9 +85,11 @@ private void onJEIRegistryImpl(Consumer<Class<? extends ITabScreen>> consumer) {
consumer.accept(GolemCuriosListScreen.class);
}

public ItemStack getSkin(HumanoidGolemEntity le) {
@Nullable
public String getSkin(HumanoidGolemEntity le) {
return CuriosApi.getCuriosInventory(le).resolve().flatMap(e -> e.getStacksHandler("golem_skin"))
.map(ICurioStacksHandler::getStacks).map(e -> e.getSlots() == 0 ? null : e.getStackInSlot(0)).orElse(ItemStack.EMPTY);
.map(ICurioStacksHandler::getStacks).map(e -> e.getSlots() == 0 ? null : e.getStackInSlot(0))
.filter(e->!e.isEmpty()).map(e -> e.getHoverName().getString()).orElse(null);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import dev.xkmc.modulargolems.content.menu.target.TargetConfigScreen;
import dev.xkmc.modulargolems.content.recipe.GolemAssembleRecipe;
import dev.xkmc.modulargolems.init.ModularGolems;
import dev.xkmc.modulargolems.init.data.MGTagGen;
import mezz.jei.api.IModPlugin;
import mezz.jei.api.JeiPlugin;
import mezz.jei.api.constants.RecipeTypes;
Expand Down Expand Up @@ -108,14 +107,6 @@ private static String partSubtype(ItemStack stack, UidContext ctx) {
private static void addPartCraftRecipes(List<IJeiAnvilRecipe> recipes, GolemMaterialConfig config, IVanillaRecipeFactory factory) {
for (var mat : config.getAllMaterials()) {
var arr = config.ingredients.get(mat).getItems();
boolean special = false;
for (ItemStack stack : arr) {
if (stack.is(MGTagGen.SPECIAL_CRAFT)) {
special = true;
break;
}
}
if (special) continue;
for (var item : GolemPart.LIST) {
List<ItemStack> list = new ArrayList<>();
for (ItemStack stack : arr) {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading