Skip to content

Commit

Permalink
Initial port to 1.19.2
Browse files Browse the repository at this point in the history
  • Loading branch information
thenamesnano committed Dec 16, 2022
1 parent 7fbc7c6 commit 8c12b54
Show file tree
Hide file tree
Showing 112 changed files with 164 additions and 149 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<img src="https://github.com/thenamesnano/Patterned-Glass/blob/forge-1.18.2/src/main/resources/patternedglass.png"/>
<img src="https://github.com/thenamesnano/Patterned-Glass/blob/forge-1.19/src/main/resources/patternedglass.png"/>
</p>
<h1 align="center">Patterned Glass</h1>
<h4 align="center">~Vanilla+ Style Stained-Glass Mosaics~</h4>
Expand Down
19 changes: 6 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
buildscript {
repositories {
maven { url = 'https://maven.minecraftforge.net' }
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
}
plugins {
id 'eclipse'
id 'maven-publish'
id 'net.minecraftforge.gradle' version '5.1.+'
}
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'

String semver = "${version_major}.${version_minor}.${version_patch}"

Expand Down Expand Up @@ -69,8 +62,8 @@ dependencies {
name : 'forge',
version: "${project.minecraft_version}-${project.forge_version}"
])
compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api") // Adds JEI API as a compile dependency
runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
//compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api") // Adds JEI API as a compile dependency
//runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
}

repositories {
Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Patterned Glass (Forge) Changelog
https://github.com/thenamesnano/Patterned-Glass

3.0
====
- 3.0.0 Initial port to 1.19.2

2.0
====
- 2.0.0 Initial port to 1.18.2
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
org.gradle.daemon=false

# Minecraft
minecraft_version=1.18.2
minecraft_version_range=[1.18.2, 1.19)
minecraft_version=1.19.2
minecraft_version_range=[1.19.2, 1.20)

# Forge
forge_version=40.1.86
loader_version_range=[40,)
forge_version_range=[40.1.0,)
forge_version=43.2.0
loader_version_range=[43,)
forge_version_range=[43.2.0,)
forge_group=net.minecraftforge

# Other Dependencies
jei_version=9.7.1.255
jei_version=11.4.0.290

# Mod Version
version_major=2
version_major=3
version_minor=0
version_patch=0

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
16 changes: 11 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
Expand Down Expand Up @@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
14 changes: 8 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
6 changes: 6 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven { url = 'https://maven.minecraftforge.net/' }
}
}
35 changes: 1 addition & 34 deletions src/main/java/com/nanosplace/patternedglass/PatternedGlass.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,40 +54,7 @@ public PatternedGlass() {

private void setup(final FMLCommonSetupEvent event) {}

private void doClientStuff(final FMLClientSetupEvent event) {
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.WHITE_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.ORANGE_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.MAGENTA_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.LIGHT_BLUE_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.YELLOW_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.LIME_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.PINK_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.GRAY_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.LIGHT_GRAY_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.CYAN_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.PURPLE_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.BLUE_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.BROWN_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.GREEN_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.RED_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.BLACK_PATTERNED_GLASS.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.WHITE_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.ORANGE_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.MAGENTA_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.LIGHT_BLUE_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.YELLOW_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.LIME_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.PINK_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.GRAY_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.LIGHT_GRAY_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.CYAN_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.PURPLE_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.BLUE_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.BROWN_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.GREEN_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.RED_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
ItemBlockRenderTypes.setRenderLayer(RegistryHandler.BLACK_PATTERNED_GLASS_PANE.get(), RenderType.translucent());
}
private void doClientStuff(final FMLClientSetupEvent event) {}

private void enqueueIMC(final InterModEnqueueEvent event) {}

Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# patternedglass mods.toml
modLoader="javafml"
loaderVersion="[40,)"
loaderVersion="[43,)"
license="LGPL-3.0"
issueTrackerURL="https://github.com/thenamesnano/Patterned-Glass/issues"

Expand All @@ -20,13 +20,13 @@ A mod that adds in patterned glass.
[[dependencies.patternedglass]]
modId="forge"
mandatory=true
versionRange="[40,)"
versionRange="[43,)"
ordering="NONE"
side="BOTH"

[[dependencies.patternedglass]]
modId="minecraft"
mandatory=true
versionRange="[1.18.2,1.19)"
versionRange="[1.19.2,1.20)"
ordering="NONE"
side="BOTH"
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside",
"parent": "patternedglass:block/template_glass_pane_noside",
"textures": {
"pane": "patternedglass:block/black_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside_alt",
"parent": "patternedglass:block/template_glass_pane_noside_alt",
"textures": {
"pane": "patternedglass:block/black_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_post",
"parent": "patternedglass:block/template_glass_pane_post",
"textures": {
"pane": "patternedglass:block/black_patterned_glass",
"edge": "patternedglass:block/black_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_side",
"parent": "patternedglass:block/template_glass_pane_side",
"textures": {
"pane": "patternedglass:block/black_patterned_glass",
"edge": "patternedglass:block/black_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_side_alt",
"parent": "patternedglass:block/template_glass_pane_side_alt",
"textures": {
"pane": "patternedglass:block/black_patterned_glass",
"edge": "patternedglass:block/black_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside",
"parent": "patternedglass:block/template_glass_pane_noside",
"textures": {
"pane": "patternedglass:block/blue_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside_alt",
"parent": "patternedglass:block/template_glass_pane_noside_alt",
"textures": {
"pane": "patternedglass:block/blue_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_post",
"parent": "patternedglass:block/template_glass_pane_post",
"textures": {
"pane": "patternedglass:block/blue_patterned_glass",
"edge": "patternedglass:block/blue_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_side",
"parent": "patternedglass:block/template_glass_pane_side",
"textures": {
"pane": "patternedglass:block/blue_patterned_glass",
"edge": "patternedglass:block/blue_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_side_alt",
"parent": "patternedglass:block/template_glass_pane_side_alt",
"textures": {
"pane": "patternedglass:block/blue_patterned_glass",
"edge": "patternedglass:block/blue_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside",
"parent": "patternedglass:block/template_glass_pane_noside",
"textures": {
"pane": "patternedglass:block/brown_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside_alt",
"parent": "patternedglass:block/template_glass_pane_noside_alt",
"textures": {
"pane": "patternedglass:block/brown_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_post",
"parent": "patternedglass:block/template_glass_pane_post",
"textures": {
"pane": "patternedglass:block/brown_patterned_glass",
"edge": "patternedglass:block/brown_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_side",
"parent": "patternedglass:block/template_glass_pane_side",
"textures": {
"pane": "patternedglass:block/brown_patterned_glass",
"edge": "patternedglass:block/brown_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_side_alt",
"parent": "patternedglass:block/template_glass_pane_side_alt",
"textures": {
"pane": "patternedglass:block/brown_patterned_glass",
"edge": "patternedglass:block/brown_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside",
"parent": "patternedglass:block/template_glass_pane_noside",
"textures": {
"pane": "patternedglass:block/cyan_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside_alt",
"parent": "patternedglass:block/template_glass_pane_noside_alt",
"textures": {
"pane": "patternedglass:block/cyan_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_post",
"parent": "patternedglass:block/template_glass_pane_post",
"textures": {
"pane": "patternedglass:block/cyan_patterned_glass",
"edge": "patternedglass:block/cyan_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_side",
"parent": "patternedglass:block/template_glass_pane_side",
"textures": {
"pane": "patternedglass:block/cyan_patterned_glass",
"edge": "patternedglass:block/cyan_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_side_alt",
"parent": "patternedglass:block/template_glass_pane_side_alt",
"textures": {
"pane": "patternedglass:block/cyan_patterned_glass",
"edge": "patternedglass:block/cyan_patterned_glass_pane_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside",
"parent": "patternedglass:block/template_glass_pane_noside",
"textures": {
"pane": "patternedglass:block/gray_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_noside_alt",
"parent": "patternedglass:block/template_glass_pane_noside_alt",
"textures": {
"pane": "patternedglass:block/gray_patterned_glass"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:block/template_glass_pane_post",
"parent": "patternedglass:block/template_glass_pane_post",
"textures": {
"pane": "patternedglass:block/gray_patterned_glass",
"edge": "patternedglass:block/gray_patterned_glass_pane_top"
Expand Down
Loading

0 comments on commit 8c12b54

Please sign in to comment.