more work

MisterMecky · May 24, 2022 · 2fb8284 · 2fb8284
1 parent a10de1e
commit 2fb8284
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 43 deletions.
diff --git a/1.3/Defs/RecipeDefs/Recipes_Milling.xml b/1.3/Defs/RecipeDefs/Recipes_Milling.xml
@@ -3,7 +3,7 @@
 
     <!-- TODO: ?? Make abstract to inherit from ?? -->
 	<RecipeDef>
-		<defName>UVE_SmashGrains</defName>
+		<defName>MKY_SmashGrains</defName>
 		<label>smash grain into flour</label>
 		<description>Smash grains into usable flour. A toilsome process.</description>
 		<jobString>Smashing grain.</jobString>
@@ -18,25 +18,25 @@
 			<li>
 				<filter>
 					<thingDefs>
-						<li>UVE_RawWheat</li>
+						<li>MKY_RawWheat</li>
 					</thingDefs>
 				</filter>
 				<count>25</count>
 			</li>
 		</ingredients>
 		<fixedIngredientFilter>
 			<thingDefs>
-				<li>UVE_RawWheat</li>
+				<li>MKY_RawWheat</li>
 			</thingDefs>
 		</fixedIngredientFilter>
 		<products>
 			<VCE_Flour>25</VCE_Flour>
 		</products>
-        <researchPrerequisite>UVE_GrainCultivation</researchPrerequisite>
+        <researchPrerequisite>MKY_GrainCultivation</researchPrerequisite>
   	</RecipeDef>
 
   	<RecipeDef>
-		<defName>UVE_MillGrainsQuern</defName>
+		<defName>MKY_MillGrainsQuern</defName>
 		<label>mill grain into flour</label>
 		<description>Grind grains into usable flour.</description>
 		<jobString>Milling grain.</jobString>
@@ -45,21 +45,21 @@
 		<soundWorking>Recipe_CookMeal</soundWorking>
 		<workAmount>200</workAmount>
 		<recipeUsers>
-			<li>UVE_Quernstone</li>					
+			<li>MKY_Quernstone</li>					
 		</recipeUsers>
 		<ingredients>
 			<li>
 				<filter>
 					<thingDefs>
-						<li>UVE_RawWheat</li>
+						<li>MKY_RawWheat</li>
 					</thingDefs>
 				</filter>
 				<count>25</count>
 			</li>
 		</ingredients>
 		<fixedIngredientFilter>
 			<thingDefs>
-				<li>UVE_RawWheat</li>
+				<li>MKY_RawWheat</li>
 			</thingDefs>
 		</fixedIngredientFilter>
 		<products>
@@ -68,7 +68,7 @@
   	</RecipeDef>
 
     <RecipeDef>
-		<defName>UVE_MillGrainsMachine</defName>
+		<defName>MKY_MillGrainsMachine</defName>
 		<label>mill grain into flour</label>
 		<description>Grind grains into usable flour.</description>
 		<jobString>Milling grain.</jobString>
@@ -77,21 +77,21 @@
 		<soundWorking>Recipe_Machining</soundWorking>
 		<workAmount>200</workAmount>
 		<recipeUsers>
-			<li>UVE_MillingMachine</li>					
+			<li>MKY_MillingMachine</li>					
 		</recipeUsers>
 		<ingredients>
 			<li>
 				<filter>
 					<thingDefs>
-						<li>UVE_RawWheat</li>
+						<li>MKY_RawWheat</li>
 					</thingDefs>
 				</filter>
 				<count>25</count>
 			</li>
 		</ingredients>
 		<fixedIngredientFilter>
 			<thingDefs>
-				<li>UVE_RawWheat</li>
+				<li>MKY_RawWheat</li>
 			</thingDefs>
 		</fixedIngredientFilter>
 		<products>

diff --git a/1.3/Defs/ResearchProjectDefs/ResearchProjects.xml b/1.3/Defs/ResearchProjectDefs/ResearchProjects.xml
@@ -2,7 +2,7 @@
 <Defs>
 
     <ResearchProjectDef>
-        <defName>UVE_GrainCultivation</defName>
+        <defName>MKY_GrainCultivation</defName>
         <label>grain cultivation</label>
         <tab>VCE_Cooking</tab>
         <description>Cultivate grains and process it into useable flour.</description>
@@ -13,14 +13,14 @@
     </ResearchProjectDef>
 
     <ResearchProjectDef>
-        <defName>UVE_AdvancedMilling</defName>
+        <defName>MKY_AdvancedMilling</defName>
         <label>advanced milling</label>
         <tab>VCE_Cooking</tab>
         <description>Build mindmills for automatic flour milling.</description>
         <baseCost>1000</baseCost>
         <techLevel>Neolithic</techLevel>
         <prerequisites>
-            <li>UVE_GrainCultivation</li>
+            <li>MKY_GrainCultivation</li>
         </prerequisites>
         <researchViewX>1.00</researchViewX>
         <researchViewY>3.00</researchViewY>

diff --git a/1.3/Defs/ThingDefs_Buildings/Buildings_Production.xml b/1.3/Defs/ThingDefs_Buildings/Buildings_Production.xml
@@ -2,7 +2,7 @@
 <Defs>
 
     <ThingDef ParentName="BenchBase">
-		<defName>UVE_Quernstone</defName>
+		<defName>MKY_Quernstone</defName>
 		<label>quern</label>
 		<description>A quern stone used for milling grains into flour.</description>
 		<thingClass>Building_WorkTable</thingClass>
@@ -46,13 +46,13 @@
 			<li>PlaceWorker_PreventInteractionSpotOverlap</li>
 		</placeWorkers>
 		<researchPrerequisites>
-			<li>UVE_GrainCultivation</li>
+			<li>MKY_GrainCultivation</li>
 			<li>Stonecutting</li>
 		</researchPrerequisites>
 	</ThingDef>
 
     <ThingDef ParentName="BenchBase">
-		<defName>UVE_MillingMachine</defName>
+		<defName>MKY_MillingMachine</defName>
 		<label>milling machine</label>
 		<description>A machine used for milling grains into flour.</description>
 		<thingClass>Building_WorkTable</thingClass>
@@ -103,7 +103,7 @@
 			<li>PlaceWorker_PreventInteractionSpotOverlap</li>
 		</placeWorkers>
 		<researchPrerequisites>
-			<li>UVE_GrainCultivation</li>
+			<li>MKY_GrainCultivation</li>
 			<li>Electricity</li>
 		</researchPrerequisites>
 	</ThingDef>

diff --git a/1.3/Defs/ThingDefs_Items/Items_Resource_RawPlant.xml b/1.3/Defs/ThingDefs_Items/Items_Resource_RawPlant.xml
@@ -2,7 +2,7 @@
 <Defs>
 
     <ThingDef ParentName="RoughPlantBase">
-        <defName>UVE_RawWheat</defName>
+        <defName>MKY_RawWheat</defName>
         <label>wheat</label>
         <description>Wheat grains. Edible for animals, but requires processing for human consumption. Lasts a very long time.</description>
         <graphicData>

diff --git a/1.3/Defs/WorkGiverDefs/WorkGivers.xml b/1.3/Defs/WorkGiverDefs/WorkGivers.xml
@@ -2,14 +2,14 @@
 <Defs>
 
     <WorkGiverDef>
-		<defName>UVE_MillGrain</defName>
+		<defName>MKY_MillGrain</defName>
 		<label>mill grain into flour</label>
 		<giverClass>WorkGiver_DoBill</giverClass>
 		<workType>Cooking</workType>
 		<priorityInType>101</priorityInType>
 		<fixedBillGiverDefs>
-			<li>UVE_Quernstone</li>
-            <li>UVE_MillingMachine</li> 
+			<li>MKY_Quernstone</li>
+            <li>MKY_MillingMachine</li> 
 		</fixedBillGiverDefs>
 		<verb>mill grain</verb>
 		<gerund>milling grains at</gerund>

diff --git a/...illaPlantsExpanded-MorePlants/Defs/ThingDefs_Items/Items_Resource_RawPlant_MorePlants.xml b/...illaPlantsExpanded-MorePlants/Defs/ThingDefs_Items/Items_Resource_RawPlant_MorePlants.xml
@@ -2,7 +2,7 @@
 <Defs>
 
     <ThingDef ParentName="RoughPlantBase">
-        <defName>UVE_RawRye</defName>
+        <defName>MKY_RawRye</defName>
         <label>rye</label>
         <description>Rye grains. Edible for animals, but requires processing for human consumption. Lasts a long time.</description>
         <graphicData>
@@ -29,7 +29,7 @@
 
     <!-- TODO: Make usable in meals without processing -->
     <ThingDef ParentName="RoughPlantBase">
-        <defName>UVE_RawBarley</defName>
+        <defName>MKY_RawBarley</defName>
         <label>barley</label>
         <description>Barley grains. Edible for animals, but requires processing for human consumption. Lasts a long time.</description>
         <graphicData>
@@ -55,7 +55,7 @@
     </ThingDef>
 
     <ThingDef ParentName="RoughPlantBase">
-        <defName>UVE_RawSorghum</defName>
+        <defName>MKY_RawSorghum</defName>
         <label>sorghum</label>
         <description>Sorghum grains. Edible for animals, but requires processing for human consumption. Lasts a long time.</description>
         <graphicData>

diff --git a/1.3/Mods/VanillaPlantsExpanded-MorePlants/Patches/UVE-WheatToFlour.xml_MorePlants b/1.3/Mods/VanillaPlantsExpanded-MorePlants/Patches/UVE-WheatToFlour.xml_MorePlants
@@ -3,22 +3,22 @@
         <operations>
 
             <li Class="PatchOperationAdd">
-                <xpath>Defs/RecipeDef[defName="UVE_SmashGrains" or defName="UVE_MillGrainsQuern" or defName="UVE_MillGrainsMachine"]/ingredients/li/filter/thingDefs</xpath>
+                <xpath>Defs/RecipeDef[defName="MKY_SmashGrains" or defName="MKY_MillGrainsQuern" or defName="MKY_MillGrainsMachine"]/ingredients/li/filter/thingDefs</xpath>
                 <value>
                     <li>VCE_RawOats</li>
-                    <li>UVE_RawRye</li>
-                    <li>UVE_RawSorghum</li>
-                    <li>UVE_RawBarley</li>
+                    <li>MKY_RawRye</li>
+                    <li>MKY_RawSorghum</li>
+                    <li>MKY_RawBarley</li>
                 </value>
             </li>
 
             <li Class="PatchOperationAdd">
-                <xpath>Defs/RecipeDef[defName="UVE_SmashGrains" or defName="UVE_MillGrainsQuern" or defName="UVE_MillGrainsMachine"]/fixedIngredientFilter/thingDefs</xpath>
+                <xpath>Defs/RecipeDef[defName="MKY_SmashGrains" or defName="MKY_MillGrainsQuern" or defName="MKY_MillGrainsMachine"]/fixedIngredientFilter/thingDefs</xpath>
                 <value>
                     <li>VCE_RawOats</li>
-                    <li>UVE_RawRye</li>
-                    <li>UVE_RawSorghum</li>
-                    <li>UVE_RawBarley</li>
+                    <li>MKY_RawRye</li>
+                    <li>MKY_RawSorghum</li>
+                    <li>MKY_RawBarley</li>
                 </value>
             </li>
 

diff --git a/1.3/Mods/VanillaPlantsExpanded-MorePlants/Patches/VPE-MorePlants_MorePlants.xml b/1.3/Mods/VanillaPlantsExpanded-MorePlants/Patches/VPE-MorePlants_MorePlants.xml
@@ -27,7 +27,7 @@
             <li Class="PatchOperationReplace">
                 <xpath>Defs/ThingDef[defName="VCE_Rye"]/plant/harvestedThingDef</xpath>
                 <value>
-                    <harvestedThingDef>UVE_RawRye</harvestedThingDef>
+                    <harvestedThingDef>MKY_RawRye</harvestedThingDef>
                 </value>
             </li>
 
@@ -36,7 +36,7 @@
             <li Class="PatchOperationReplace">
                 <xpath>Defs/ThingDef[defName="VCE_Sorghum"]/plant/harvestedThingDef</xpath>
                 <value>
-                    <harvestedThingDef>UVE_RawSorghum</harvestedThingDef>
+                    <harvestedThingDef>MKY_RawSorghum</harvestedThingDef>
                 </value>
             </li>
 
@@ -45,7 +45,7 @@
             <li Class="PatchOperationReplace">
                 <xpath>Defs/ThingDef[defName="VCE_Barley"]/plant/harvestedThingDef</xpath>
                 <value>
-                    <harvestedThingDef>UVE_RawBarley</harvestedThingDef>
+                    <harvestedThingDef>MKY_RawBarley</harvestedThingDef>
                 </value>
             </li>
 

diff --git a/1.3/Patches/VanillaCookingExpanded.xml b/1.3/Patches/VanillaCookingExpanded.xml
@@ -7,7 +7,7 @@
             <li Class="PatchOperationReplace">
                 <xpath>Defs/ThingDef[defName="VCE_Wheat"]/plant/harvestedThingDef</xpath>
                 <value>
-                    <harvestedThingDef>UVE_RawWheat</harvestedThingDef>
+                    <harvestedThingDef>MKY_RawWheat</harvestedThingDef>
                 </value>
             </li>
 
@@ -21,7 +21,7 @@
                 <xpath>Defs/ThingDef[defName="VCE_Wheat"]/plant</xpath>
                 <value>
                     <sowResearchPrerequisites Inherit="False">
-                        <li>UVE_GrainCultivation</li>
+                        <li>MKY_GrainCultivation</li>
                     </sowResearchPrerequisites>
                 </value>
             </li>
@@ -33,7 +33,7 @@
                                         defName="VCE_CookBakeFineBulk" or defName="VCE_CookBakeLavish" or defName="VCE_CookBakeLavishBulk" or
                                         defName="VCE_CookBakeGourmet"]</xpath>
                 <value>
-                    <researchPrerequisite>UVE_GrainCultivation</researchPrerequisite>
+                    <researchPrerequisite>MKY_GrainCultivation</researchPrerequisite>
                 </value>
             </li>
 

diff --git a/About/About.xml b/About/About.xml
@@ -1,5 +1,5 @@
 <ModMetaData>
-    <name>Wheat to Flour - Unofficial Vanilla Expanded</name>
+    <name>Wheat to Flour DEV</name>
     <description>Adds wheat to flour production.</description>
     <author>MisterMecky</author>
     <supportedVersions>
@@ -19,5 +19,5 @@
 			<downloadUrl>https://github.com/juanosarg/VanillaCookingExpanded</downloadUrl>
 		</li>
 	</modDependencies>
-    <packageId>MisterMecky.WheatToFlourUVE</packageId>
+    <packageId>MisterMecky.WheatToFlourMKYDev</packageId>
 </ModMetaData>
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Wheat to Flour - Unofficial Vanilla Expanded
+## Wheat to Flour
 
 ![Preview](/About/Preview.png)
 

diff --git a/...ding/Workbenches/MillingMachine-north.png → ...ding/Workbenches/MillingMachine_north.png b/...ding/Workbenches/MillingMachine-north.png → ...ding/Workbenches/MillingMachine_north.png
diff --git a/...ding/Workbenches/MillingMachine-south.png → ...ding/Workbenches/MillingMachine_south.png b/...ding/Workbenches/MillingMachine-south.png → ...ding/Workbenches/MillingMachine_south.png