Skip to content

Commit

Permalink
Add programmer art connected textures
Browse files Browse the repository at this point in the history
- Resolve #43
- Change resourceCondition default pack name from "vanilla" to "default"
- Bump version
  • Loading branch information
PepperCode1 committed Feb 17, 2022
1 parent d6563ec commit 4f7f6a1
Show file tree
Hide file tree
Showing 864 changed files with 224 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ org.gradle.jvmargs = -Xmx1G
loader_version = 0.12.12

# Mod Properties
mod_version = 1.0.4
mod_version = 1.1.0
mod_minecraft_version = 1.18
maven_group = me.pepperbell
archives_base_name = continuity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ protected void parseResourceCondition() {
packStr = null;
}
Predicate<ResourcePack> predicate;
if (packStr == null || packStr.equals("vanilla")) {
if (packStr == null || packStr.equals("default")) {
predicate = pack -> pack == defaultPack;
} else if (packStr.equals("programmer_art")) {
predicate = pack -> pack.getName().equals("Programmer Art");
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
method=horizontal
matchBlocks=bookshelf
tiles=0-3
faces=sides
resourceCondition=textures/block/bookshelf.png@programmer_art
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
method=ctm
matchBlocks=black_stained_glass
tiles=0-46
connect=block
resourceCondition=textures/block/black_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
method=ctm
matchBlocks=black_stained_glass_pane
tiles=0-46
faces=sides
connect=block
resourceCondition=textures/block/black_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
method=ctm
matchBlocks=blue_stained_glass
tiles=0-46
connect=block
resourceCondition=textures/block/blue_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
method=ctm
matchBlocks=blue_stained_glass_pane
tiles=0-46
faces=sides
connect=block
resourceCondition=textures/block/blue_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
method=ctm
matchBlocks=brown_stained_glass
tiles=0-46
connect=block
resourceCondition=textures/block/brown_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
method=ctm
matchBlocks=brown_stained_glass_pane
tiles=0-46
faces=sides
connect=block
resourceCondition=textures/block/brown_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
method=ctm
matchBlocks=cyan_stained_glass
tiles=0-46
connect=block
resourceCondition=textures/block/cyan_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
method=ctm
matchBlocks=cyan_stained_glass_pane
tiles=0-46
faces=sides
connect=block
resourceCondition=textures/block/cyan_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
method=ctm
matchBlocks=gray_stained_glass
tiles=0-46
connect=block
resourceCondition=textures/block/gray_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
method=ctm
matchBlocks=gray_stained_glass_pane
tiles=0-46
faces=sides
connect=block
resourceCondition=textures/block/gray_stained_glass.png@programmer_art
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
method=ctm
matchBlocks=green_stained_glass
tiles=0-46
connect=block
resourceCondition=textures/block/green_stained_glass.png@programmer_art
Loading

0 comments on commit 4f7f6a1

Please sign in to comment.