Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ atlassian-ide-plugin.xml

# Log file
*.log
*.gz

# BlueJ files
*.ctxt
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ minecraft {
configureEach {
workingDirectory project.file('run')

jvmArg "-XX:+AllowEnhancedClassRedefinition"
//jvmArg "-XX:+AllowEnhancedClassRedefinition" <- very bad. making my game crash like crazy
// Recommended logging data for a userdev environment
// The markers can be added/remove as needed separated by commas.
// "SCAN": For mods scan.
Expand Down
29 changes: 29 additions & 0 deletions run-data/config/fml.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#Early window height
earlyWindowHeight = 480
#Enable forge global version checking
versionCheck = true
#Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them.
earlyWindowControl = true
#Early window framebuffer scale
earlyWindowFBScale = 1
#Early window provider
earlyWindowProvider = "fmlearlywindow"
#Early window width
earlyWindowWidth = 854
#Early window starts maximized
earlyWindowMaximized = false
#Default config path for servers
defaultConfigPath = "defaultconfigs"
#Disables Optimized DFU client-side - already disabled on servers
disableOptimizedDFU = true
#Skip specific GL versions, may help with buggy graphics card drivers
earlyWindowSkipGLVersions = []
#Whether to log a help message on first attempt, to aid troubleshooting. This setting should automatically disable itself after a successful launch
earlyWindowLogHelpMessage = true
#Max threads for early initialization parallelism, -1 is based on processor count
maxThreads = -1
#Squir?
earlyWindowSquir = false
#Whether to show CPU usage stats in early window
earlyWindowShowCPU = false

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
I just copy/pasted blockstates from CSOS to get some models in game
because I can't run datagen until they're ALL done

So please don't forget to delete/make sure these files are overwritten when you run datagen the first time
Original file line number Diff line number Diff line change
@@ -1,5 +1,304 @@
{
"variants": {
"facing=east,powered=false,size=huge,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_floor",
"y": 270
},
"facing=east,powered=false,size=huge,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_wall",
"y": 270
},
"facing=east,powered=false,size=large,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_floor",
"y": 270
},
"facing=east,powered=false,size=large,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_wall",
"y": 270
},
"facing=east,powered=false,size=medium,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_floor",
"y": 270
},
"facing=east,powered=false,size=medium,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_wall",
"y": 270
},
"facing=east,powered=false,size=small,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_floor",
"y": 270
},
"facing=east,powered=false,size=small,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_wall",
"y": 270
},
"facing=east,powered=false,size=tiny,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_floor",
"y": 270
},
"facing=east,powered=false,size=tiny,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_wall",
"y": 270
},
"facing=east,powered=true,size=huge,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_floor_powered",
"y": 270
},
"facing=east,powered=true,size=huge,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_wall_powered",
"y": 270
},
"facing=east,powered=true,size=large,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_floor_powered",
"y": 270
},
"facing=east,powered=true,size=large,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_wall_powered",
"y": 270
},
"facing=east,powered=true,size=medium,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_floor_powered",
"y": 270
},
"facing=east,powered=true,size=medium,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_wall_powered",
"y": 270
},
"facing=east,powered=true,size=small,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_floor_powered",
"y": 270
},
"facing=east,powered=true,size=small,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_wall_powered",
"y": 270
},
"facing=east,powered=true,size=tiny,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_floor_powered",
"y": 270
},
"facing=east,powered=true,size=tiny,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_wall_powered",
"y": 270
},
"facing=north,powered=false,size=huge,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_floor",
"y": 180
},
"facing=north,powered=false,size=huge,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_wall",
"y": 180
},
"facing=north,powered=false,size=large,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_floor",
"y": 180
},
"facing=north,powered=false,size=large,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_wall",
"y": 180
},
"facing=north,powered=false,size=medium,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_floor",
"y": 180
},
"facing=north,powered=false,size=medium,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_wall",
"y": 180
},
"facing=north,powered=false,size=small,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_floor",
"y": 180
},
"facing=north,powered=false,size=small,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_wall",
"y": 180
},
"facing=north,powered=false,size=tiny,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_floor",
"y": 180
},
"facing=north,powered=false,size=tiny,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_wall",
"y": 180
},
"facing=north,powered=true,size=huge,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_floor_powered",
"y": 180
},
"facing=north,powered=true,size=huge,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_wall_powered",
"y": 180
},
"facing=north,powered=true,size=large,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_floor_powered",
"y": 180
},
"facing=north,powered=true,size=large,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_wall_powered",
"y": 180
},
"facing=north,powered=true,size=medium,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_floor_powered",
"y": 180
},
"facing=north,powered=true,size=medium,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_wall_powered",
"y": 180
},
"facing=north,powered=true,size=small,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_floor_powered",
"y": 180
},
"facing=north,powered=true,size=small,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_wall_powered",
"y": 180
},
"facing=north,powered=true,size=tiny,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_floor_powered",
"y": 180
},
"facing=north,powered=true,size=tiny,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_wall_powered",
"y": 180
},
"facing=south,powered=false,size=huge,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_floor"
},
"facing=south,powered=false,size=huge,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_wall"
},
"facing=south,powered=false,size=large,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_floor"
},
"facing=south,powered=false,size=large,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_wall"
},
"facing=south,powered=false,size=medium,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_floor"
},
"facing=south,powered=false,size=medium,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_wall"
},
"facing=south,powered=false,size=small,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_floor"
},
"facing=south,powered=false,size=small,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_wall"
},
"facing=south,powered=false,size=tiny,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_floor"
},
"facing=south,powered=false,size=tiny,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_wall"
},
"facing=south,powered=true,size=huge,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_floor_powered"
},
"facing=south,powered=true,size=huge,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_wall_powered"
},
"facing=south,powered=true,size=large,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_floor_powered"
},
"facing=south,powered=true,size=large,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_wall_powered"
},
"facing=south,powered=true,size=medium,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_floor_powered"
},
"facing=south,powered=true,size=medium,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_wall_powered"
},
"facing=south,powered=true,size=small,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_floor_powered"
},
"facing=south,powered=true,size=small,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_wall_powered"
},
"facing=south,powered=true,size=tiny,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_floor_powered"
},
"facing=south,powered=true,size=tiny,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_wall_powered"
},
"facing=west,powered=false,size=huge,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_floor",
"y": 90
},
"facing=west,powered=false,size=huge,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_wall",
"y": 90
},
"facing=west,powered=false,size=large,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_floor",
"y": 90
},
"facing=west,powered=false,size=large,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_wall",
"y": 90
},
"facing=west,powered=false,size=medium,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_floor",
"y": 90
},
"facing=west,powered=false,size=medium,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_wall",
"y": 90
},
"facing=west,powered=false,size=small,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_floor",
"y": 90
},
"facing=west,powered=false,size=small,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_wall",
"y": 90
},
"facing=west,powered=false,size=tiny,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_floor",
"y": 90
},
"facing=west,powered=false,size=tiny,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_wall",
"y": 90
},
"facing=west,powered=true,size=huge,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_floor_powered",
"y": 90
},
"facing=west,powered=true,size=huge,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_huge_wall_powered",
"y": 90
},
"facing=west,powered=true,size=large,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_floor_powered",
"y": 90
},
"facing=west,powered=true,size=large,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_large_wall_powered",
"y": 90
},
"facing=west,powered=true,size=medium,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_floor_powered",
"y": 90
},
"facing=west,powered=true,size=medium,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_medium_wall_powered",
"y": 90
},
"facing=west,powered=true,size=small,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_floor_powered",
"y": 90
},
"facing=west,powered=true,size=small,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_small_wall_powered",
"y": 90
},
"facing=west,powered=true,size=tiny,wall=false": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_floor_powered",
"y": 90
},
"facing=west,powered=true,size=tiny,wall=true": {
"model": "sound_of_flesh:block/voicebox/voicebox_tiny_wall_powered",
"y": 90
"": {
"model": "sound_of_flesh:block/voicebox"
}
Expand Down
Loading