diff --git a/src/main/resources/assets/advanced_ae/blockstates/adv_pattern_provider.json b/src/main/resources/assets/advanced_ae/blockstates/adv_pattern_provider.json
index 2483cedf..88f262bb 100644
--- a/src/main/resources/assets/advanced_ae/blockstates/adv_pattern_provider.json
+++ b/src/main/resources/assets/advanced_ae/blockstates/adv_pattern_provider.json
@@ -4,7 +4,7 @@
       "model": "advanced_ae:block/adv_pattern_provider_all"
     },
     "push_direction=all,connection_state=true": {
-      "model": "advanced_ae:block/adv_pattern_provider_on"
+      "model": "advanced_ae:block/adv_pattern_provider_all"
     },
     "push_direction=east,connection_state=false": {
       "model": "advanced_ae:block/adv_pattern_provider_oriented",
@@ -12,7 +12,7 @@
       "y": 90
     },
     "push_direction=east,connection_state=true": {
-      "model": "advanced_ae:block/adv_pattern_provider_oriented_on",
+      "model": "advanced_ae:block/adv_pattern_provider_oriented",
       "x": 90,
       "y": 90
     },
@@ -22,7 +22,7 @@
       "y": 270
     },
     "push_direction=west,connection_state=true": {
-      "model": "advanced_ae:block/adv_pattern_provider_oriented_on",
+      "model": "advanced_ae:block/adv_pattern_provider_oriented",
       "x": 90,
       "y": 270
     },
@@ -31,7 +31,7 @@
       "x": 270
     },
     "push_direction=south,connection_state=true": {
-      "model": "advanced_ae:block/adv_pattern_provider_oriented_on",
+      "model": "advanced_ae:block/adv_pattern_provider_oriented",
       "x": 270
     },
     "push_direction=north,connection_state=false": {
@@ -39,7 +39,7 @@
       "x": 90
     },
     "push_direction=north,connection_state=true": {
-      "model": "advanced_ae:block/adv_pattern_provider_oriented_on",
+      "model": "advanced_ae:block/adv_pattern_provider_oriented",
       "x": 90
     },
     "push_direction=up,connection_state=false": {
@@ -47,7 +47,7 @@
       "x": 0
     },
     "push_direction=up,connection_state=true": {
-      "model": "advanced_ae:block/adv_pattern_provider_oriented_on",
+      "model": "advanced_ae:block/adv_pattern_provider_oriented",
       "x": 0
     },
     "push_direction=down,connection_state=false": {
@@ -55,7 +55,7 @@
       "x": 180
     },
     "push_direction=down,connection_state=true": {
-      "model": "advanced_ae:block/adv_pattern_provider_oriented_on",
+      "model": "advanced_ae:block/adv_pattern_provider_oriented",
       "x": 180
     }
   }
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider.png b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider.png
index 93046646..440607ec 100644
Binary files a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider.png and b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider.png differ
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt.png b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt.png
index d22f4913..73f4c630 100644
Binary files a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt.png and b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt.png differ
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt_ani.png b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt_ani.png
deleted file mode 100644
index c2f905fb..00000000
Binary files a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt_ani.png and /dev/null differ
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt_ani.png.mcmeta b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt_ani.png.mcmeta
deleted file mode 100644
index ceecb036..00000000
--- a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_alt_ani.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"animation": {
-		"frametime": 2
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_ani.png b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_ani.png
deleted file mode 100644
index e59b483a..00000000
Binary files a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_ani.png and /dev/null differ
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_ani.png.mcmeta b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_ani.png.mcmeta
deleted file mode 100644
index 6931337e..00000000
--- a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_ani.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"animation": {
-		"frametime": 2,
-		"frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0]
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back.png b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back.png
index d7ea793f..31f2c500 100644
Binary files a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back.png and b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back.png differ
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back_ani.png b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back_ani.png
deleted file mode 100644
index ffc77d8b..00000000
Binary files a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back_ani.png and /dev/null differ
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back_ani.png.mcmeta b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back_ani.png.mcmeta
deleted file mode 100644
index 6931337e..00000000
--- a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_back_ani.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"animation": {
-		"frametime": 2,
-		"frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0]
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front.png b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front.png
index edddf0f0..dd2fa2d4 100644
Binary files a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front.png and b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front.png differ
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front_ani.png b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front_ani.png
deleted file mode 100644
index 096e7465..00000000
Binary files a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front_ani.png and /dev/null differ
diff --git a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front_ani.png.mcmeta b/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front_ani.png.mcmeta
deleted file mode 100644
index 6931337e..00000000
--- a/src/main/resources/assets/advanced_ae/textures/block/adv_pattern_provider_front_ani.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"animation": {
-		"frametime": 2,
-		"frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0]
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider.png b/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider.png
index 91eb3888..c67d5cb0 100644
Binary files a/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider.png and b/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider.png differ
diff --git a/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider_back.png b/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider_back.png
index ad45690f..bc44b3f3 100644
Binary files a/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider_back.png and b/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider_back.png differ
diff --git a/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider_sides.png b/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider_sides.png
index e32e5666..8b21f7e8 100644
Binary files a/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider_sides.png and b/src/main/resources/assets/advanced_ae/textures/part/adv_pattern_provider_sides.png differ