Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanups, Refactors and a Datagen #106

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Cleanups, Refactors and a Datagen #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
af7cb16
re add jei integration
Minecraftschurli Jun 15, 2022
a63bc52
cleanups
Minecraftschurli Jun 15, 2022
bfef092
huge refactor
Minecraftschurli Jun 20, 2022
f103084
add datagen and test
Minecraftschurli Jun 20, 2022
528a096
more cleanup
Minecraftschurli Jun 21, 2022
53b7337
more cleanup and refactoring
Minecraftschurli Jun 21, 2022
1518830
move some values to enums and add Length as a step towards being able…
Minecraftschurli Jun 22, 2022
9474de0
update jei
Minecraftschurli Jun 29, 2022
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
27 changes: 22 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ minecraft {
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

mods {
thismod {
gbook {
source sourceSets.main
source sourceSets.test
}
}
}
Expand All @@ -80,20 +81,36 @@ minecraft {
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

mods {
thismod {
gbook {
source sourceSets.main
}
}
}
data {
property 'forge.logging.markers', ''
property 'forge.logging.console.level', 'debug'

property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

args '--mod', 'gbook', '--all', '--output', file('src/test/resources/'), '--existing', file('src/main/resources/')

mods {
gbook {
source sourceSets.main
source sourceSets.test
}
}
}
}
}

dependencies {
minecraft 'net.minecraftforge:forge:1.19-41.0.17'


//compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.5.174:api")
//runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.5.174")
compileOnly fg.deobf("mezz.jei:jei-1.19-common-api:11.0.0.206")
runtimeOnly fg.deobf("mezz.jei:jei-1.19-forge:11.0.0.206")

implementation fg.deobf( "net.darkhax.gamestages:GameStages-Forge-1.19:9.0.1")
implementation fg.deobf( "net.darkhax.bookshelf:Bookshelf-Forge-1.19:14.0.2")
Expand Down Expand Up @@ -162,4 +179,4 @@ project.afterEvaluate {
}
}
}
}
}
7 changes: 3 additions & 4 deletions src/main/java/dev/gigaherz/guidebook/GuidebookMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@
import net.minecraftforge.fml.event.config.ModConfigEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.ObjectHolder;
import net.minecraftforge.registries.RegisterEvent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Mod(GuidebookMod.MODID)
public class GuidebookMod
Expand All @@ -35,7 +34,7 @@ public class GuidebookMod
@ObjectHolder(value = "gbook:guidebook", registryName = "item")
public static GuidebookItem guidebook;

public static final Logger logger = LogManager.getLogger(MODID);
public static final Logger logger = LoggerFactory.getLogger(MODID);

public static final CreativeModeTab tabGuidebooks = new CreativeModeTab(MODID)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/gigaherz/guidebook/client/ClientAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.gigaherz.guidebook.client;

import dev.gigaherz.guidebook.guidebook.BookDocument;
import dev.gigaherz.guidebook.guidebook.book.BookDocument;
import dev.gigaherz.guidebook.guidebook.BookRegistry;
import dev.gigaherz.guidebook.guidebook.client.GuidebookScreen;
import net.minecraft.client.Minecraft;
Expand Down
Loading